diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index 53d3e2bcb..85557adc0 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -3,11 +3,7 @@
 module SessionsHelper
   def prefilled_username
     uri = Addressable::URI.parse(session["user_return_to"])
-    if uri && uri.query_values
-      uri.query_values["username"]
-    else
-      nil
-    end
+    uri&.query_values&.fetch("login_hint", "")
   end
 
   def display_registration_link?
diff --git a/app/views/sessions/_form.haml b/app/views/sessions/_form.haml
index a4e608386..4f480f1ad 100644
--- a/app/views/sessions/_form.haml
+++ b/app/views/sessions/_form.haml
@@ -23,6 +23,7 @@
                    autocapitalize: "none",
                    autocorrect: "off",
                    autofocus: true,
+                   value: prefilled_username,
                    aria: {labelledby: "usernameLabel"}
 
     - if mobile