diff --git a/webui-src/app/login.js b/webui-src/app/login.js
index e864722..cce4e4c 100644
--- a/webui-src/app/login.js
+++ b/webui-src/app/login.js
@@ -65,6 +65,7 @@ function loginComponent() {
       id: 'password',
       type: 'password',
       placeholder: 'Password',
+      oncreate: (e) => e.dom.focus(),
       onchange: (e) => (passwd = e.target.value),
       onkeydown: (e) => {
         if (e.keyCode === 13) {
diff --git a/webui-src/assets/index.html b/webui-src/assets/index.html
index 9b9e413..435dc6e 100644
--- a/webui-src/assets/index.html
+++ b/webui-src/assets/index.html
@@ -19,7 +19,6 @@
         <script type="text/javascript">
             function load_ui() {
                 var main = require('main');
-                document.getElementById('password').focus();
             }
         </script>
         <noscript>Sorry but JavaScript is needed here! Please enable it in your browser.</noscript>