diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index d962c5f47..0db3f3ebb 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -55,20 +55,24 @@
     line-height: @line-height;
   }
 
-  .control-group .errors {
-    background-color: @color-critical;
-    font-size: @font-size-small;
-    margin: 2em 0 0 0;
-    padding: 0;
-
-    > li {
-      padding: 1em;
-      color: @body-bg-color;
-    }
+  .errors,
+  .form-errors {
+    list-style-type: none;
+    padding: 0.5em;
   }
 
-  .control-group {
-    margin: 0 auto; // Center horizontally
+  .errors {
+    background-color: @color-critical;
+    color: white;
+  }
+
+  .form-errors {
+    margin-top: 0;
+    padding: 0;
+  }
+
+  .control-group,
+  .form-errors {
     width: 24em;
   }
 
diff --git a/public/css/icinga/responsive.less b/public/css/icinga/responsive.less
index 975fa7157..8260e3d22 100644
--- a/public/css/icinga/responsive.less
+++ b/public/css/icinga/responsive.less
@@ -90,11 +90,6 @@
   }
 
   #login {
-
-    .form-controls {
-      margin: .5em;
-    }
-
     #icinga-logo {
       max-width: 12em;
     }