diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
index c5b34775d26..f20178d6df4 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
@@ -1049,8 +1049,7 @@ public class SystemConnectionForm implements Listener, IRSEUserIdConstants, Sele
 		final String hostName = textHostName.getText().trim();
 
 		// d43191
-		if (connectionNameEmpty)
-			internalSetConnectionName(hostName);
+		if (connectionNameEmpty && contentsCreated) internalSetConnectionName(hostName);
 
 		errorMessage = null;