diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 6c14e7216..6539eddbd 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -134,7 +134,11 @@
                 <md-input-container class="md-block">
                   <label><var:string label:value="Verification Code"/></label>
                   <md-icon>lock</md-icon>
-                  <input type="text" ng-pattern="app.verificationCodePattern" ng-model="app.creds.verificationCode" ng-required="app.loginState == 'totpcode'"/>
+                  <input type="text"
+                         ng-pattern="app.verificationCodePattern"
+                         ng-model="app.creds.verificationCode"
+                         ng-required="app.loginState == 'totpcode'"
+                         sg-focus-on="totpcode"/>
                   <div class="sg-hint"><var:string label:value="Enter the 6-digit verification code from your TOTP application."/></div>
                 </md-input-container>
                 <div layout="row" layout-align="space-between center">
diff --git a/UI/WebServerResources/js/Main/Main.app.js b/UI/WebServerResources/js/Main/Main.app.js
index 8580e1635..80da04bf6 100644
--- a/UI/WebServerResources/js/Main/Main.app.js
+++ b/UI/WebServerResources/js/Main/Main.app.js
@@ -9,8 +9,8 @@
   /**
    * @ngInject
    */
-  LoginController.$inject = ['$scope', '$window', '$timeout', 'Dialog', '$mdDialog', 'Authentication'];
-  function LoginController($scope, $window, $timeout, Dialog, $mdDialog, Authentication) {
+  LoginController.$inject = ['$scope', '$window', '$timeout', 'Dialog', '$mdDialog', 'Authentication', 'sgFocus'];
+  function LoginController($scope, $window, $timeout, Dialog, $mdDialog, Authentication, focus) {
     var vm = this;
 
     this.$onInit = function() {
@@ -43,6 +43,7 @@
 
           if (data.totpmissingkey) {
             vm.loginState = 'totpcode';
+            focus('totpcode');
           }
           else if (data.totpdisabled) {
             vm.loginState = 'totpdisabled';