diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index fe19d34f8d5..48c94640fc5 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -20,7 +20,7 @@
       <form name="loginForm" class="login-form gf-form-group" ng-hide="disableLoginForm">
 				<div class="gf-form" ng-if="loginMode">
 					<span class="gf-form-label width-7">User</span>
-					<input type="text" name="username" class="gf-form-input max-width-14" required ng-model='formModel.user' placeholder={{loginHint}}>
+					<input type="text" name="username" class="gf-form-input max-width-14" required ng-model='formModel.user' placeholder={{loginHint}} autofocus>
 				</div>
 				<div class="gf-form" ng-if="loginMode">
 					<span class="gf-form-label width-7">Password</span>