diff --git a/guacamole/src/main/webapp/app/login/directives/login.js b/guacamole/src/main/webapp/app/login/directives/login.js
index 02aa1ac37..51c366f95 100644
--- a/guacamole/src/main/webapp/app/login/directives/login.js
+++ b/guacamole/src/main/webapp/app/login/directives/login.js
@@ -171,12 +171,8 @@ angular.module('login').directive('guacLogin', [function guacLogin() {
                     // Clear all remaining fields that are not username fields
                     angular.forEach($scope.remainingFields, function clearEnteredValueIfPassword(field) {
 
-                        // Remove entered value only if field is a password field
-                        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 && field.name in $scope.enteredValues)
+                        // If field is not username field, delete it.
+                        if (field.type !== Field.Type.USERNAME && field.name in $scope.enteredValues)
                             delete $scope.enteredValues[field.name];
 
                     });