diff --git a/src/accounts/forms.py b/src/accounts/forms.py
index aa0d7b8..290f4e3 100644
--- a/src/accounts/forms.py
+++ b/src/accounts/forms.py
@@ -1,5 +1,6 @@
 from django import forms
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
+from allauth.account.forms import SignupForm
 from .models import Address, User
 
 class AddressForm(forms.ModelForm):
@@ -45,3 +46,15 @@ class CustomerUpdateForm(forms.ModelForm):
             'email',
             'default_shipping_address',
         )
+
+class UserSignupForm(SignupForm):
+    first_name = forms.CharField(required=True, widget=forms.TextInput(attrs={'placeholder': 'First name'}))
+    last_name = forms.CharField(required=True, widget=forms.TextInput(attrs={'placeholder': 'Last name'}))
+
+    def save(self, request):
+        user = super(UserSignupForm, self).save(request)
+        user.first_name = self.cleaned_data['first_name']
+        user.last_name = self.cleaned_data['last_name']
+        user.username = self.cleaned_data['email']
+        user.save()
+        return user
diff --git a/src/ptcoffee/settings.py b/src/ptcoffee/settings.py
index 83cee0d..7dc7397 100644
--- a/src/ptcoffee/settings.py
+++ b/src/ptcoffee/settings.py
@@ -119,6 +119,7 @@ AUTHENTICATION_BACKENDS = (
 )
 
 AUTH_USER_MODEL = 'accounts.User'
+ACCOUNT_FORMS = {'signup': 'accounts.forms.UserSignupForm'}
 LOGIN_REDIRECT_URL = reverse_lazy('storefront:product-list')
 
 ACCOUNT_EMAIL_REQUIRED = True
@@ -187,24 +188,44 @@ TEMPLATED_EMAIL_BACKEND = 'templated_email.backends.vanilla_django.TemplateBacke
 SITE_ID = 1
 
 # Logging
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'standard': {
-            'format': '%(asctime)s %(levelname)s %(name)s %(message)s'
+if DEBUG:
+    LOGGING = {
+        'version': 1,
+        'disable_existing_loggers': False,
+        'formatters': {
+            'standard': {
+                'format': '%(asctime)s %(levelname)s %(name)s %(message)s'
+            },
         },
-    },
-    'handlers': {
-        'console': {
-            'class': 'logging.StreamHandler',
+        'handlers': {
+            'console': {
+                'class': 'logging.StreamHandler',
+            },
         },
-    },
-    'root': {
-        'handlers': ['console'],
-        'level': 'DEBUG',
-    },
-}
+        'root': {
+            'handlers': ['console'],
+            'level': 'DEBUG',
+        },
+    }
+else:
+    LOGGING = {
+        'version': 1,
+        'disable_existing_loggers': False,
+        'handlers': {
+            'file': {
+                'level': 'DEBUG',
+                'class': 'logging.FileHandler',
+                'filename': '/var/log/django-ptcoffee/debug.log',
+            },
+        },
+        'loggers': {
+            'django': {
+                'handlers': ['file'],
+                'level': 'DEBUG',
+                'propagate': True,
+            },
+        },
+    }
 
 CART_SESSION_ID = 'cart'
 
diff --git a/src/storefront/views.py b/src/storefront/views.py
index 4d42ab8..77747cc 100644
--- a/src/storefront/views.py
+++ b/src/storefront/views.py
@@ -205,7 +205,7 @@ class OrderCreateView(CreateView):
                 'last_name': self.request.user.last_name,
             }
             initial |= user_info
-        else:
+        elif self.request.session.get('shipping_address'):
             a = self.request.session.get('shipping_address')
             user_info = {
                 'email': a['email'],