diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index aa99daf85a6..a5894866d5a 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -17,53 +17,55 @@
 			</div>
 
       <form name="loginForm" class="login-form">
-        <div class="tight-form" ng-if="loginMode">
-          <ul class="tight-form-list">
-            <li class="tight-form-item" style="width: 78px">
-							<strong>User</strong>
-            </li>
-            <li>
-              <input type="text" name="username" class="tight-form-input last" required ng-model='formModel.user' placeholder="email or username" style="width: 253px">
-            </li>
-          </ul>
-          <div class="clearfix"></div>
-        </div>
-        <div class="tight-form" ng-if="loginMode">
-          <ul class="tight-form-list">
-            <li class="tight-form-item" style="width: 78px">
-							<strong>Password</strong>
-            </li>
-            <li>
-							<input type="password" name="password" class="tight-form-input last" required ng-model="formModel.password" id="inputPassword" style="width: 253px" placeholder="password">
-            </li>
-          </ul>
-          <div class="clearfix"></div>
+				<div class="tight-from-container">
+					<div class="tight-form" ng-if="loginMode">
+						<ul class="tight-form-list">
+							<li class="tight-form-item" style="width: 78px">
+								<strong>User</strong>
+							</li>
+							<li>
+								<input type="text" name="username" class="tight-form-input last" required ng-model='formModel.user' placeholder="email or username" style="width: 253px">
+							</li>
+						</ul>
+						<div class="clearfix"></div>
+					</div>
+					<div class="tight-form" ng-if="loginMode">
+						<ul class="tight-form-list">
+							<li class="tight-form-item" style="width: 78px">
+								<strong>Password</strong>
+							</li>
+							<li>
+								<input type="password" name="password" class="tight-form-input last" required ng-model="formModel.password" id="inputPassword" style="width: 253px" placeholder="password">
+							</li>
+						</ul>
+						<div class="clearfix"></div>
+					</div>
+
+					<div class="tight-form" ng-if="!loginMode">
+						<ul class="tight-form-list">
+							<li class="tight-form-item" style="width: 79px">
+								<strong>Email</strong>
+							</li>
+							<li>
+								<input type="email" class="tight-form-input last" required ng-model='formModel.email' placeholder="email" style="width: 253px">
+							</li>
+						</ul>
+						<div class="clearfix"></div>
+					</div>
+
+					<div class="tight-form" ng-if="!loginMode">
+						<ul class="tight-form-list">
+							<li class="tight-form-item" style="width: 79px">
+								<strong>Password</strong>
+							</li>
+							<li>
+								<input type="password" class="tight-form-input last" watch-change="formModel.password = inputValue;" ng-minlength="4" required ng-model='formModel.password' placeholder="password" style="width: 253px">
+							</li>
+						</ul>
+						<div class="clearfix"></div>
+					</div>
 				</div>
 
-				<div class="tight-form" ng-if="!loginMode">
-          <ul class="tight-form-list">
-            <li class="tight-form-item" style="width: 79px">
-							<strong>Email</strong>
-            </li>
-            <li>
-              <input type="email" class="tight-form-input last" required ng-model='formModel.email' placeholder="email" style="width: 253px">
-            </li>
-          </ul>
-          <div class="clearfix"></div>
-        </div>
-
-				<div class="tight-form" ng-if="!loginMode">
-          <ul class="tight-form-list">
-            <li class="tight-form-item" style="width: 79px">
-							<strong>Password</strong>
-            </li>
-            <li>
-							<input type="password" class="tight-form-input last" watch-change="formModel.password = inputValue;" ng-minlength="4" required ng-model='formModel.password' placeholder="password" style="width: 253px">
-            </li>
-          </ul>
-          <div class="clearfix"></div>
-        </div>
-
 				<div ng-if="!loginMode" style="margin-left: 97px; width: 254px;">
 					<password-strength password="formModel.password"></password-strength>
 				</div>
@@ -87,23 +89,23 @@
 					with Github
 				</a>
 			</div>
-	</div>
-
-	<div class="row" style="margin-top: 40px">
-		<div class="text-center">
-			<a href="user/password/send-reset-email">
-				Forgot your password?
-			</a>
 		</div>
-	</div>
 
-	<div class="row" style="margin-top: 50px">
-		<div class="version-footer text-center small">
-			Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}},
-			build date: {{buildInfo.buildstamp | date: 'yyyy-MM-dd HH:mm:ss' }}
+		<div class="row" style="margin-top: 40px">
+			<div class="text-center">
+				<a href="user/password/send-reset-email">
+					Forgot your password?
+				</a>
+			</div>
 		</div>
+
+		<div class="row" style="margin-top: 50px">
+			<div class="version-footer text-center small">
+				Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}},
+				build date: {{buildInfo.buildstamp | date: 'yyyy-MM-dd HH:mm:ss' }}
+			</div>
+		</div>
+
 	</div>
 
-</div>
-