diff --git a/requirements.txt b/requirements.txt
index d620eeb..0022318 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,9 @@
 Django==1.6.5
 django-auth-ldap==1.2.0
 django-extensions==1.3.8
-dj-static==0.0.5
-python-ldap==2.4.15
-South==1.0
-MySQL-python==1.2.5
 django-ldapdb==0.3.2
+dj-static==0.0.5
+MySQL-python==1.2.5
+python-ldap==2.4.15
+six==1.7.3
+South==1.0
diff --git a/userinfosite/settings-sample.py b/userinfosite/settings-sample.py
index a7b334e..1a8bc2a 100644
--- a/userinfosite/settings-sample.py
+++ b/userinfosite/settings-sample.py
@@ -127,7 +127,7 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 SITE_ID = 1
 
 EMAIL_HOST = 'snes.neuf.no'
-FROM_EMAIL = 'no-reply@neuf.no'
+DEFAULT_FROM_EMAIL = 'no-reply@neuf.no'
 
 AUTHENTICATION_BACKENDS = (
     'django_auth_ldap.backend.LDAPBackend',
diff --git a/userinfosite/urls.py b/userinfosite/urls.py
index 6ec6f5f..6e3a036 100644
--- a/userinfosite/urls.py
+++ b/userinfosite/urls.py
@@ -14,17 +14,16 @@ urlpatterns = patterns('',
     url(r'^accounts/logout/$', 'main.views.logout'),
     # Change password
     url(r'^accounts/password/change$', 'django.contrib.auth.views.password_change',
-        {'password_change_form': LDAPPasswordChangeForm}),
+        { 'password_change_form': LDAPPasswordChangeForm }),
     url(r'^accounts/password/change/done$', 'django.contrib.auth.views.password_change_done', name='password_change_done'),
     # Reset password (forgot password)
     url(r'^accounts/password/reset$', 'django.contrib.auth.views.password_reset',
-        {'password_reset_form' : LDAPPasswordResetForm,
-         'from_email' : settings.FROM_EMAIL}),
+        { 'password_reset_form' : LDAPPasswordResetForm }),
     url(r'^accounts/password/reset/done$', 'django.contrib.auth.views.password_reset_done', name='password_reset_done'),
     # Set password
     url(r'^accounts/password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)$',
         'main.views.password_reset_confirm',
-        {'set_password_form': LDAPSetPasswordForm}),
+        { 'set_password_form': LDAPSetPasswordForm }),
     url(r'^accounts/password/reset/complete$', 'django.contrib.auth.views.password_reset_complete'),
     url(r'^userstatus/client/$', 'main.views.client_status'),
     url(r'^userstatus/wireless/$', 'main.views.wireless_status'),