diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index f59834f8..eec57ca8 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -166,7 +166,8 @@
     {
         if (firstRender && PageState.User == null && _allowsitelogin)
         {
-            await username.FocusAsync();
+            if(!string.IsNullOrEmpty(username.Id))
+                await username.FocusAsync();
         }
 
         // redirect logged in user to specified page