diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 27abca251..e0e435efc 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -2,6 +2,7 @@ Django
 django-admin-bootstrapped
 django-bootstrap3
 django-braces
+django-crispy-forms
 django-vanilla-views
 mysqlclient
 psycopg2
diff --git a/sapl/settings.py b/sapl/settings.py
index 7eb00ffe0..62f7a69c8 100644
--- a/sapl/settings.py
+++ b/sapl/settings.py
@@ -55,6 +55,7 @@ INSTALLED_APPS = (
     # more
     'django_extensions',
     'bootstrap3',
+    'crispy_forms',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -129,3 +130,6 @@ STATIC_URL = '/static/'
 
 DAB_FIELD_RENDERER = \
     'django_admin_bootstrapped.renderers.BootstrapFieldRenderer'
+
+CRISPY_TEMPLATE_PACK = 'bootstrap3'
+CRISPY_FAIL_SILENTLY = not DEBUG