diff --git a/guacamole/src/main/webapp/app/login/directives/login.js b/guacamole/src/main/webapp/app/login/directives/login.js
index f918a555e..02aa1ac37 100644
--- a/guacamole/src/main/webapp/app/login/directives/login.js
+++ b/guacamole/src/main/webapp/app/login/directives/login.js
@@ -172,11 +172,11 @@ angular.module('login').directive('guacLogin', [function guacLogin() {
                     angular.forEach($scope.remainingFields, function clearEnteredValueIfPassword(field) {
 
                         // Remove entered value only if field is a password field
-                        if (field.type === Field.Type.PASSWORD)
+                        if (field.type === Field.Type.PASSWORD && field.name in $scope.enteredValues)
                             $scope.enteredValues[field.name] = '';
 
                         // If field is not username field and not password field, delete it.
-                        else if (field.type !== Field.Type.USERNAME)
+                        else if (field.type !== Field.Type.USERNAME && field.name in $scope.enteredValues)
                             delete $scope.enteredValues[field.name];
 
                     });