diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java
index 451a10ba534..7f3a2e5cd90 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java
@@ -62,10 +62,9 @@ public abstract class AuthenticatingConnectorService extends AbstractConnectorSe
 	 */
 	public final void setUserId(String newId) {
 		String oldUserId = credentialsProvider.getUserId();
-		if (oldUserId == null || oldUserId.equals(newId)) {
-			updateDefaultUserId(getPrimarySubSystem(), getUserId());
+		if (oldUserId == null || !oldUserId.equals(newId)) {
 			credentialsProvider.setUserId(newId);
-			setDirty(true);
+			saveUserId();
 		}
 	}