Index: trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java	(revision 9312)
+++ trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java	(revision 9313)
@@ -6,4 +6,5 @@
 import java.util.EnumMap;
 import java.util.Map;
+import java.util.Objects;
 
 import org.openstreetmap.josm.Main;
@@ -47,5 +48,7 @@
             return null;
         try {
-            if (getRequestorType().equals(Authenticator.RequestorType.SERVER) && OsmApi.isUsingOAuth()) {
+            if (OsmApi.isUsingOAuth()
+                    && Objects.equals(OsmApi.getOsmApi().getHost(), getRequestingHost())
+                    && RequestorType.SERVER.equals(getRequestorType())) {
                 // if we are working with OAuth we don't prompt for a password
                 return null;