diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java
index 1f35880f3b9..51f6bdd86ff 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java
@@ -402,6 +402,9 @@ public class SystemResources extends NLS
 
 	public static String RESID_PASSWORD_LABEL;
 	public static String RESID_PASSWORD_TIP;
+	
+	public static String RESID_PASSWORD_SYSTEMTYPE_LABEL;
+	public static String RESID_PASSWORD_HOSTNAME_LABEL;
 
 	public static String RESID_PASSWORD_USERID_LABEL;
 	public static String RESID_PASSWORD_USERID_TIP;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties
index d169e2f1fc0..d92b9755e69 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties
@@ -654,17 +654,17 @@ RESID_TESTFILTERSTRING_TREE_TIP=Results of resolving the filter string
 #=============================================================
 # PROMPT FOR PASSWORD DIALOG...
 #=============================================================
-RESID_PASSWORD_TITLE=Enter Password
-RESID_PASSWORD_LABEL=Password
-RESID_PASSWORD_TIP=Enter password for connecting
-RESID_PASSWORD_USERID_LABEL=User ID
-RESID_PASSWORD_USERID_TIP=Enter user ID. It will be remembered
-#NOTE TO TRANSLATER: FOLLOWING LABEL MUST HAVE 2 SPACES IN FRONT OF IT
-# yantzi: artemis 6.0, chagned to save user ID to be consistent with password prompt
-RESID_PASSWORD_USERID_ISPERMANENT_LABEL=  Save user ID
-RESID_PASSWORD_USERID_ISPERMANENT_TIP=Select to make user ID change permanent
-RESID_PASSWORD_SAVE_LABEL= Save password
-RESID_PASSWORD_SAVE_TOOLTIP= Save the password for the specified hostname and user ID
+RESID_PASSWORD_TITLE = Enter Password
+RESID_PASSWORD_LABEL = Password
+RESID_PASSWORD_TIP = Enter password for connecting to this host
+RESID_PASSWORD_SYSTEMTYPE_LABEL=System type
+RESID_PASSWORD_HOSTNAME_LABEL=Host name
+RESID_PASSWORD_USERID_LABEL = User ID
+RESID_PASSWORD_USERID_TIP = Enter user ID for connecting to this host
+RESID_PASSWORD_USERID_ISPERMANENT_LABEL = Save user ID
+RESID_PASSWORD_USERID_ISPERMANENT_TIP = Save the user ID for later use when connecting to this host
+RESID_PASSWORD_SAVE_LABEL = Save password
+RESID_PASSWORD_SAVE_TOOLTIP = Save the password for later use when connecting to this host with this user ID
 
 #=============================================================
 # CHANGE PASSWORD DIALOG...
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPasswordPromptDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPasswordPromptDialog.java
index e6b2e89205e..fa0d382f9d6 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPasswordPromptDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPasswordPromptDialog.java
@@ -160,7 +160,7 @@ public final class SystemPasswordPromptDialog extends SystemPromptDialog impleme
 		// dwd: cannot set height hints on labels since that causes cut off text for large fonts used by those with impaired vision
 
 		// System type
-		String text = SystemWidgetHelpers.appendColon(SystemResources.RESID_CONNECTION_SYSTEMTYPE_READONLY_LABEL);
+		String text = SystemWidgetHelpers.appendColon(SystemResources.RESID_PASSWORD_SYSTEMTYPE_LABEL);
 		Label label = SystemWidgetHelpers.createLabel(composite_prompts, text);
 		GridData gd = new GridData();
 		label.setLayoutData(gd);
@@ -169,7 +169,7 @@ public final class SystemPasswordPromptDialog extends SystemPromptDialog impleme
 		label.setLayoutData(gd);
 
 		// Host name
-		text = SystemWidgetHelpers.appendColon(SystemResources.RESID_CONNECTION_HOSTNAME_READONLY_LABEL);
+		text = SystemWidgetHelpers.appendColon(SystemResources.RESID_PASSWORD_HOSTNAME_LABEL);
 		label = SystemWidgetHelpers.createLabel(composite_prompts, text);
 		gd = new GridData();
 		label.setLayoutData(gd);
@@ -179,7 +179,7 @@ public final class SystemPasswordPromptDialog extends SystemPromptDialog impleme
 
 		// UserId
 		if (connectorService.supportsUserId()) {
-			textUserId = SystemWidgetHelpers.createLabeledTextField(composite_prompts, this, SystemResources.RESID_CONNECTION_USERID_LABEL, SystemResources.RESID_CONNECTION_USERID_TIP);
+			textUserId = SystemWidgetHelpers.createLabeledTextField(composite_prompts, this, SystemResources.RESID_PASSWORD_USERID_LABEL, SystemResources.RESID_PASSWORD_USERID_TIP);
 		}
 
 		// Password prompt