diff --git a/euscanwww/euscanwww/settings.py b/euscanwww/euscanwww/settings.py
index 733c72c..2e7628c 100644
--- a/euscanwww/euscanwww/settings.py
+++ b/euscanwww/euscanwww/settings.py
@@ -202,14 +202,16 @@ LOGGING = {
     }
 }
 
+# django-registration
 ACCOUNT_ACTIVATION_DAYS = 7
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
+# djeuscan tasks
 PORTAGE_ROOT = "/usr/portage/"
 PORTAGE_CONFIGROOT = PORTAGE_ROOT
 LAYMAN_CONFIG = "/etc/layman/layman.cfg"
 EMERGE_REGEN_JOBS = 4
 
-
 # Celery config
 import djcelery
 djcelery.setup_loader()
@@ -218,6 +220,14 @@ CELERY_RESULT_BACKEND = "amqp"
 BROKER_CONNECTION_TIMEOUT = 3600
 CELERYD_CONCURRENCY = 4
 
+# LDAP authentication
+# TODO: Test data - change me!
+AUTH_LDAP_SERVER_URI = "ldap://localhost"
+AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=users,dc=my-domain,dc=com"
+AUTHENTICATION_BACKENDS = (
+    'django_auth_ldap.backend.LDAPBackend',
+    'django.contrib.auth.backends.ModelBackend',
+)
 
 try:
     from local_settings import *
diff --git a/setup.py b/setup.py
index c6adb5f..2954d54 100755
--- a/setup.py
+++ b/setup.py
@@ -87,10 +87,12 @@ setup(
         'https://github.com/iksaif/euscan/tarball/' +
         ('master' if __version__ == '9999' else ('euscan-%s' % __version__))
     ),
-    install_requires=['Django==1.4', 'django-annoying==0..7.6', 'South==0.7.4',
-                      'django-piston==0.2.3', 'BeautifulSoup==3.2.1',
-                      'matplotlib==1.1.0', 'django-celery==2.5.5',
-                      'django-registration==0.8'],
+    install_requires=[
+        'Django==1.4', 'django-annoying==0.7.6', 'South==0.7.4',
+        'django-piston==0.2.3', 'BeautifulSoup==3.2.1', 'matplotlib==1.1.0',
+        'django-celery==2.5.5', 'django-registration==0.8',
+        'python-ldap==2.4.10', 'django-auth-ldap==1.1',
+    ],
     package_dir={'': 'pym'},
     packages=packages,
     package_data={},