diff --git a/docker/settings.py b/docker/settings.py
index 462f432..e5d4824 100644
--- a/docker/settings.py
+++ b/docker/settings.py
@@ -162,6 +162,28 @@ AUTHENTICATION_BACKENDS = [
     'django.contrib.auth.backends.ModelBackend',
 ]
 
+# Password validation
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        'OPTIONS': {
+            'min_length': 8,
+        }
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+    {
+        'NAME': 'password_validation.ComplexityValidator',
+    },
+]
+
 REST_FRAMEWORK = {
     'DEFAULT_PERMISSION_CLASSES': (
         'layerindex.restperm.ReadOnlyPermission',
diff --git a/password_validation.py b/password_validation.py
new file mode 100644
index 0000000..8669250
--- /dev/null
+++ b/password_validation.py
@@ -0,0 +1,25 @@
+from django.core.exceptions import ValidationError
+from django.utils.translation import ugettext as _
+
+import re
+
+class ComplexityValidator(object):
+    def validate(self, password, user=None):
+        score = 0
+        if re.search('[0-9]', password):
+            score += 1
+        if password.lower() != password:
+            score += 1
+        if re.search('[^a-zA-Z0-9]', password):
+            score += 1
+
+        if score < 2:
+            raise ValidationError(
+                _("This password does not contain at least two of: upper/lowercase characters; a number; a special (non-alphanumeric) character."),
+                code='password_too_simple'
+            )
+
+    def get_help_text(self):
+        return _(
+            "Your password must contain at least two of: upper/lowercase characters; a number; a special (non-alphanumeric) character"
+        )
diff --git a/settings.py b/settings.py
index 9a12a7b..80d28f7 100644
--- a/settings.py
+++ b/settings.py
@@ -162,6 +162,28 @@ AUTHENTICATION_BACKENDS = [
     'django.contrib.auth.backends.ModelBackend',
 ]
 
+# Password validation
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        'OPTIONS': {
+            'min_length': 8,
+        }
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+    {
+        'NAME': 'password_validation.ComplexityValidator',
+    },
+]
+
 REST_FRAMEWORK = {
     'DEFAULT_PERMISSION_CLASSES': (
         'layerindex.restperm.ReadOnlyPermission',
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 45f8c9a..38833af 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -20,6 +20,9 @@
             <div class="controls">
                 {{ field }}
             </div>
+        <p>
+        {{ field.help_text|safe }}
+        </p>
         </div>
     {% endfor %}