diff --git a/ui/desktop/app/templates/origin.hbs b/ui/desktop/app/templates/origin.hbs
index 1421af91d..8fbae5380 100644
--- a/ui/desktop/app/templates/origin.hbs
+++ b/ui/desktop/app/templates/origin.hbs
@@ -15,7 +15,8 @@
         @type="text"
         @value={{this.origin}}
         @label={{t "form.origin.label"}}
-        @helperText={{t "form.origin.description"}} />
+        @helperText={{t "form.origin.description"}}
+        {{autofocus}} />
       <form.actions
         @submitText={{t "actions.submit"}}
         @showCancel={{false}} />
diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/method.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/method.hbs
index 709c1f491..8cdf94c64 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate/method.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate/method.hbs
@@ -13,7 +13,8 @@
     @name="identification"
     @type="text"
     @value={{this.identification}}
-    @label={{t "form.login_name.label"}} />
+    @label={{t "form.login_name.label"}}
+    {{autofocus}} />
 
   <form.input
     @name="password"
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index 993f5e605..90b794ab4 100644
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -39,6 +39,7 @@
     "core": "*",
     "doctoc": "^1.4.0",
     "ember-auto-import": "^1.6.0",
+    "ember-autofocus-modifier": "^1.1.0",
     "ember-cli": "~3.20.2",
     "ember-cli-app-version": "^3.2.0",
     "ember-cli-babel": "^7.21.0",
diff --git a/yarn.lock b/yarn.lock
index 49aca9113..6e151364c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8140,6 +8140,14 @@ ember-auto-import@^1.2.15, ember-auto-import@^1.2.19, ember-auto-import@^1.5.3,
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
+ember-autofocus-modifier@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-autofocus-modifier/-/ember-autofocus-modifier-1.1.0.tgz#2180e560699290b8e2abba40f265844368cb4b26"
+  integrity sha512-o5q6vkRg95pJoF8zNo7zHT8/RRNJv3AcHiBXg0UGKfEi6XjrbiTa48kjUPOz3+zz2CrJLZCDcVLUGEk2tZG0Jg==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    ember-modifier "^2.1.0"
+
 ember-breadcrumbs@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/ember-breadcrumbs/-/ember-breadcrumbs-0.2.3.tgz#a95e02b73fdc2150f3d552e84a479d6dc96a8b31"
@@ -9010,7 +9018,7 @@ ember-modifier@^1.0.3:
     ember-compatibility-helpers "^1.2.1"
     ember-modifier-manager-polyfill "^1.2.0"
 
-ember-modifier@^2.1.1:
+ember-modifier@^2.1.0, ember-modifier@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-2.1.1.tgz#aa3a12e2d6cf1622f774f3f1eab4880982a43fa9"
   integrity sha512-g9mcpFWgw5lgNU40YNf0USNWqoGTJ+EqjDQKjm7556gaRNDeGnLylFKqx9O3opwLHEt6ZODnRDy9U0S5YEMREg==