diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 631b2eb07..b0f0df4dc 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -100,11 +100,11 @@ class Form extends Zend_Form
      * @var array
      */
     public static $defaultElementDecorators = array(
-        'ViewHelper',
-        'Errors',
-        array('Description', array('tag' => 'span', 'class' => 'description')),
-        'Label',
-        array('HtmlTag', array('tag' => 'div'))
+        array('ViewHelper', array('separator' => '')),
+        array('Errors', array('separator' => '')),
+        array('Description', array('tag' => 'span', 'class' => 'description', 'separator' => '')),
+        array('Label', array('separator' => '')),
+        array('HtmlTag', array('tag' => 'div', 'class' => 'element'))
     );
 
     /**
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 7d9840ace..17ff79a74 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -24,7 +24,6 @@ td.configTable {
 label {
   display: block;
   font-weight: bold;
-  margin-bottom: 0.3em;
 }
 
 input, select {
@@ -115,7 +114,7 @@ form.link-like input[type="submit"]:hover, form.link-like input[type="submit"]:f
 
 form ul.errors {
   list-style-type: none;
-  margin: 0;
+  margin: 0.3em 0 0 0.6em;
   padding: 0;
 }
 
@@ -125,6 +124,10 @@ form ul.errors li {
   line-height: 1.5em;
 }
 
+form div.element {
+  margin: 0.5em 0;
+}
+
 form label {
   display: inline-block;
   margin-right: 1em;
@@ -138,6 +141,7 @@ select, input[type=text] {
 
 form .description {
   font-size: 0.8em;
+  margin: 0.3em 0 0 0.6em;
 }
 
 .description {
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 93e367382..0588700e9 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -51,6 +51,10 @@
     color: @colorTextDefault;
   }
 
+  .form div.element {
+    margin: 0;
+  }
+
   .form label {
     font-weight: normal;
     display: inline-block;
@@ -83,7 +87,7 @@
     color: #eee;
     border-color: #777;
     background: #777;
-    margin-left: 10.1em;
+    margin-left: 9.9em;
   }
 
   input[type=submit]:hover, a.button:hover, input[type=submit]:focus {