diff --git a/index.html b/index.html
index b66a6ae..e031aa1 100644
--- a/index.html
+++ b/index.html
@@ -126,13 +126,18 @@
                   <div class="alert alert-danger" ng-show="passwordError" ng-cloak>
                     Error: wrong password or token
                   </div>
-
                   <div class="checkbox">
                     <label class="control-label" for="savepassword">
                         <input type="checkbox" id="savepassword" ng-model="settings.savepassword">
                         Save password in your browser
                     </label>
                   </div>
+                  <div class="checkbox">
+                    <label class="control-label" for="useTotp">
+                      <input type="checkbox" id="useTotp" ng-model="settings.useTotp">
+                      Use Time-based One-Time Password <a href="https://blog.weechat.org/post/2019/01/14/Support-of-TOTP" target="_blank"><i class="glyphicon glyphicon-info-sign"></i></a>
+                    </label>
+                  </div>
                   <div class="checkbox">
                     <label class="control-label" for="ssl">
                       <input type="checkbox" id="ssl" ng-model="settings.ssl">
@@ -145,12 +150,6 @@
                         Automatically connect
                     </label>
                   </div>
-                  <div class="checkbox">
-                    <label class="control-label" for="useTotp">
-                      <input type="checkbox" id="useTotp" ng-model="settings.useTotp">
-                      Use Time-based One-Time Password <a href="https://blog.weechat.org/post/2019/01/14/Support-of-TOTP">ℹ️</a>
-                    </label>
-                  </div>
                 </div>
                 <button class="btn btn-lg btn-primary" ng-disabled="hostInvalid || (totpInvalid && settings.useTotp)" ng-click="connect()" ng-cloak>{{ connectbutton }}  <i ng-class="connectbuttonicon" class="glyphicon"></i></button>
               </form>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index ee8540e..5111d52 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -695,7 +695,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     });
 
     $scope.parseTotp = function() {
-        $scope.totpInvalid = !/^\d{6}$/.test($scope.totp);
+        $scope.totpInvalid = !/^\d{4,10}$/.test($scope.totp);
     };
 
     $scope.connect = function() {