diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 5f99aff17..805196b96 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -17,13 +17,9 @@
       '</a>'
     ); ?></p>
     <?php elseif ($requiresExternalAuth): ?>
-    <p class="icon-info info-box"><?= sprintf(
-      $this->translate(
-        'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
-          . ' Make sure you\'ll configure such either by using the %s or by setting it up manually,'
-          . ' otherwise you\'ll not be able to login.'
-      ),
-      '<em title="icingacli help users">IcingaCLI</em>'
+    <p class="info-box"><span class="icon-info"></span><?= $this->translate(
+      'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
+      . ' 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>
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index fdc076e60..f51ef946a 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -42,14 +42,10 @@ class AuthenticationPage extends Form
                 'note',
                 'external_note',
                 array(
-                    'value'         => sprintf(
-                        $this->translate(
-                            'You\'re currently not authenticated using any of the web server\'s authentication '
-                            . 'mechanisms. Make sure you\'ll configure such either by using the %s once the '
-                            . 'wizard is complete or by setting it up manually, otherwise you\'ll not be able '
-                            . 'to log into Icinga Web 2.'
-                        ),
-                        '<em title="icingacli help users">IcingaCLI</em>'
+                    'value'         => $this->translate(
+                        'You\'re currently not authenticated using any of the web server\'s authentication '
+                        . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
+                        . 'log into Icinga Web 2.'
                     ),
                     'decorators'    => array(
                         'ViewHelper',
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 223a388d2..6b03b476a 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -129,8 +129,14 @@
 
   p.info-box {
     width: 50%;
+    height: 2.2em;
     margin: 0 auto 2.5em;
 
+    span.icon-info {
+      float: left;
+      height: 100%;
+    }
+
     em {
       text-decoration: underline;
     }