diff --git a/src/accounts/utils.py b/src/accounts/utils.py
index afd9ccf..5406e4d 100644
--- a/src/accounts/utils.py
+++ b/src/accounts/utils.py
@@ -16,6 +16,9 @@ def get_or_create_customer(request, form, shipping_address):
 
     if request.user.is_authenticated:
         user = request.user
+        if not user.default_shipping_address:
+            user.default_shipping_address = address
+            user.save()
     else:
         user, u_created = User.objects.get_or_create(
             email=form.cleaned_data['email'],
diff --git a/src/storefront/views.py b/src/storefront/views.py
index 8f73d53..4d42ab8 100644
--- a/src/storefront/views.py
+++ b/src/storefront/views.py
@@ -166,6 +166,18 @@ class CheckoutAddressView(FormView):
                 'state': address.state,
                 'postal_code': address.postal_code
             }
+        elif self.request.session.get('shipping_address'):
+            address = self.request.session.get('shipping_address')
+            initial = {
+                'first_name': address['first_name'],
+                'last_name': address['last_name'],
+                'email': address['email'],
+                'street_address_1': address['street_address_1'],
+                'street_address_2': address['street_address_2'],
+                'city': address['city'],
+                'state': address['state'],
+                'postal_code': address['postal_code']
+            }
         return initial
 
     def form_valid(self, form):