Index: trunk/src/org/openstreetmap/josm/data/UserIdentityManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/UserIdentityManager.java	(revision 18653)
+++ trunk/src/org/openstreetmap/josm/data/UserIdentityManager.java	(revision 18654)
@@ -314,5 +314,5 @@
             accessTokenKeyChanged = false;
             accessTokenSecretChanged = false;
-            if (OsmApi.isUsingOAuth()) {
+            if (OsmApi.isUsingOAuthAndOAuthSetUp(OsmApi.getOsmApi())) {
                 getInstance().initFromOAuth();
             }