diff --git a/rhodecode/public/css/main-content.less b/rhodecode/public/css/main-content.less
--- a/rhodecode/public/css/main-content.less
+++ b/rhodecode/public/css/main-content.less
@@ -61,7 +61,9 @@
     .help-block {
         display: block;
         margin-left: @label-width;
-        white-space: pre;
+        &.pre-formatting {
+            white-space: pre;
+        }
     }
 
     .action_button {
diff --git a/rhodecode/templates/admin/auth/plugin_settings.mako b/rhodecode/templates/admin/auth/plugin_settings.mako
--- a/rhodecode/templates/admin/auth/plugin_settings.mako
+++ b/rhodecode/templates/admin/auth/plugin_settings.mako
@@ -72,7 +72,7 @@
                           <span class="error-message">${errors.get(node.name)}</span>
                           <br />
                         %endif
-                        <p class="help-block">${node.description}</p>
+                        <p class="help-block pre-formatting">${node.description}</p>
                       </div>
                     </div>
                   %endfor
diff --git a/rhodecode/templates/admin/repos/repo_edit_vcs.mako b/rhodecode/templates/admin/repos/repo_edit_vcs.mako
--- a/rhodecode/templates/admin/repos/repo_edit_vcs.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_vcs.mako
@@ -10,9 +10,7 @@
                     </div>
                     <div class="checkboxes">
                         ${h.checkbox('inherit_global_settings',value=True)}
-                        <span class="help-block">
-                          ${h.literal(_('Select to inherit global vcs settings.'))}
-                        </span>
+                        <span class="help-block">${h.literal(_('Select to inherit global vcs settings.'))}</span>
                     </div>
                 </div>
             </div>
diff --git a/rhodecode/templates/login.mako b/rhodecode/templates/login.mako
--- a/rhodecode/templates/login.mako
+++ b/rhodecode/templates/login.mako
@@ -69,8 +69,7 @@
                             % endif
                             ${_('an administrator if you need help.')}
                         </p>
-                            %endif
-                    
+                    %endif
 
                     ${h.submit('sign_in', _('Sign In'), class_="btn sign-in")}
 
diff --git a/rhodecode/templates/pullrequests/pullrequest.mako b/rhodecode/templates/pullrequests/pullrequest.mako
--- a/rhodecode/templates/pullrequests/pullrequest.mako
+++ b/rhodecode/templates/pullrequests/pullrequest.mako
@@ -48,9 +48,7 @@
                             </div>
                             <div class="textarea text-area editor">
                                 ${h.textarea('pullrequest_desc',size=30, )}
-                                <span class="help-block">
-                                    ${_('Write a short description on this pull request')}
-                                </span>
+                                <span class="help-block">${_('Write a short description on this pull request')}</span>
                             </div>
                         </div>