diff --git a/guacamole/src/main/webapp/index.xhtml b/guacamole/src/main/webapp/index.xhtml
index bc253126e..68926d9c8 100644
--- a/guacamole/src/main/webapp/index.xhtml
+++ b/guacamole/src/main/webapp/index.xhtml
@@ -218,6 +218,10 @@
                     if (xhr.status != 200)
                         throw new Error("Invalid login");
 
+                    // Ensure username/password fiels are blurred after submit
+                    username.blur();
+                    password.blur();
+
                     resetUI();
 
                 }