diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx.cs
index 9d55c534..8fae6190 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx.cs
@@ -151,6 +151,9 @@ namespace WebsitePanel.Portal
                 ddlTheme.Visible = false;
                 lblTheme.Visible = false;
             }
+
+            // set focus on username field
+            txtUsername.Focus();
         }
 
         protected void cmdForgotPassword_Click(object sender, EventArgs e)