diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index ebfa1ba2b..f40f5c4e0 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -5,6 +5,7 @@
    </div>
   </div>
   <div class="form" data-base-target="layout">
+    <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
     <?php if ($requiresSetup): ?>
     <p tabindex="0" class="config-note"><?= sprintf(
       $this->translate(
@@ -22,15 +23,7 @@
       . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
     ); ?></p>
     <?php endif ?>
-    <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
-   <?php
-   /* TODO: remove this as soon as notifications and forms are ready */
-   if (isset($this->errorInfo)): ?>
-    <div class="error">
-    <?= $this->errorInfo ?>
-    </div>
-   <?php endif ?>
-   <?= $this->form ?>
-   <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
+    <?= $this->form ?>
+    <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
   </div>
  </div>
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index f6144bd68..0211fdc35 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -129,7 +129,7 @@
   p.info-box {
     width: 50%;
     height: 2.2em;
-    margin: 0 auto 2.5em;
+    margin: 2em auto 2.5em;
 
     i.icon-info {
       float: left;