diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 78ff178c151..32c88d1fee4 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -99,7 +99,7 @@
           <div class="login-button-group login-button-group--right text-right">
             <a class="btn btn-link" ng-click="skip();">
               Skip
-              <info-popover mode="no-padding">
+              <info-popover mode="small-padding">
                 If you skip you will be prompted to change password next time you login.
               </info-popover>
             </a>
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 7343e6fa5fe..60ef89a5d8e 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -388,8 +388,8 @@ $input-border: 1px solid $input-border-color;
     margin-bottom: $space-xxs;
   }
 
-  &--no-padding {
-    padding-left: 0;
+  &--small-padding {
+    padding-left: 4px;
   }
 
   &:hover {