diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 868031fd..70ff6b13 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -98,7 +98,10 @@
     {
         if (firstRender)
         {
-            await username.FocusAsync();
+            if(PageState.User == null)
+            {
+                await username.FocusAsync();
+            }
         }
     }