diff --git a/nsupdate/settings.py b/nsupdate/settings.py
index d3d42d5..b797cb3 100644
--- a/nsupdate/settings.py
+++ b/nsupdate/settings.py
@@ -357,6 +357,15 @@ SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL = True
 #    In this case foo field's value will be stored when user follows this link
 #    <a href="{% url socialauth_begin 'github' %}?foo=bar">...</a>.
 
+# we need slightly different classes for bootstrap3 than the default ones
+from django.contrib.messages import constants
+MESSAGE_TAGS = {
+    constants.DEBUG: '',
+    constants.INFO: 'alert-info',
+    constants.SUCCESS: 'alert-success',
+    constants.WARNING: 'alert-warning',
+    constants.ERROR: 'alert-danger',
+}
 
 try:
     from .local_settings import *
diff --git a/nsupdate/templates/base.html b/nsupdate/templates/base.html
index 3f1ecd7..497e97b 100644
--- a/nsupdate/templates/base.html
+++ b/nsupdate/templates/base.html
@@ -94,7 +94,7 @@
                         {% endif %}
                         {% if messages %}
                             {% for message in messages %}
-                                <div class="alert alert-{{ message.tags }}">
+                                <div class="alert {{ message.tags }}">
                                     <button type="button" class="close" data-dismiss="alert">&times;</button>
                                     {{ message }}
                                 </div>