Index: trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java	(revision 3512)
+++ trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java	(revision 3513)
@@ -85,8 +85,10 @@
         /*
          * Last request was successful and there was no credentials stored
-         * in file. -> Try to recall credentials that have been entered
+         * in file (or only the username is stored).
+         * -> Try to recall credentials that have been entered
          * manually in this session.
          */
-        if (!noSuccessWithLastResponse && credentials == null && memoryCredentialsCache.containsKey(requestorType)) {
+        if (!noSuccessWithLastResponse && memoryCredentialsCache.containsKey(requestorType) &&
+                (credentials == null || credentials.getPassword() == null || credentials.getPassword().length == 0)) {
             PasswordAuthentication pa = memoryCredentialsCache.get(requestorType);
             response.setUsername(pa.getUserName());