diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
index 671742e6faa..708a0cbe908 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
@@ -15,7 +15,6 @@
 		<topic label="org.eclipse.rse.ui.keystoreProviders" href="reference/extension-points/org_eclipse_rse_ui_keystoreProviders.html" />
 		<topic label="org.eclipse.rse.ui.mountPathMappers" href="reference/extension-points/org_eclipse_rse_ui_mountPathMappers.html" />
 		<topic label="org.eclipse.rse.ui.newConnectionWizardDelegates" href="reference/extension-points/org_eclipse_rse_ui_newConnectionWizardDelegates.html" />
-		<topic label="org.eclipse.rse.ui.passwordPersistence" href="reference/extension-points/org_eclipse_rse_ui_passwordPersistence.html" />
 		<topic label="org.eclipse.rse.ui.persistenceProviders" href="reference/extension-points/org_eclipse_rse_ui_persistenceProviders.html" />
 		<topic label="org.eclipse.rse.ui.popupMenus" href="reference/extension-points/org_eclipse_rse_ui_popupMenus.html" />
 		<topic label="org.eclipse.rse.ui.propertyPages" href="reference/extension-points/org_eclipse_rse_ui_propertyPages.html" />
diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
index fca1d502d8d..1b7af8775ef 100644
--- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
@@ -140,63 +140,12 @@ public class PasswordPersistenceManager {
 	 */
 	private void initExtensions()
 	{
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IRSESystemType[] sysTypes = RSECorePlugin.getDefault().getRegistry().getSystemTypes();
+		systemTypes = new RegisteredSystemType[sysTypes.length];
 		
-		IExtensionPoint point = registry.getExtensionPoint("org.eclipse.rse.ui.passwordPersistence");
-		
-		if (point != null) 
-		{
-      		IExtension[] extensions = point.getExtensions();  		
-      		systemTypes = new RegisteredSystemType[extensions.length];
-      		
-			int count = 0;      		
-      		String systemType, caseSensitiveAsString;
-      		boolean caseSensitive;
-      		
-			for (int i = 0; i < extensions.length; i++) 
-			{
-				IConfigurationElement[] elements = extensions[i].getConfigurationElements();
-				if (elements != null && elements.length > 0)
-				{
-				    if ("provider".equals(elements[0].getName())) 
-				    {
-				    	// Make sure that all attributes are available
-				    	systemType = elements[0].getAttribute("systemType");
-				    	caseSensitiveAsString = elements[0].getAttribute("caseSensitive");
-				    	if (caseSensitiveAsString != null && caseSensitiveAsString.equals("false"))
-				    	{
-				    		caseSensitive = false;
-				    	}
-				    	else
-				    	{
-				    		caseSensitive = true;
-				    	}
-				    	
-						systemTypes[count] = new RegisteredSystemType(systemType, caseSensitive);
-						count++;
-				    }
-				}
-				else
-				{
-					SystemBasePlugin.logError("PasswordPersistenceManager.init:  Invalid extension point", null);
-				}
-			}
-
-			// Resize array if one or more of the extension points was invalid
-			if (count != extensions.length)
-			{
-				RegisteredSystemType[] temp = new RegisteredSystemType[count];
-	      		for (int i = 0; i < count; i++)
-	      		{
-	      			temp[i] = systemTypes[i];
-	      		}
-				systemTypes = temp;				
-			}
+		for (int i = 0; i < sysTypes.length; i++) {
+			systemTypes[i] = new RegisteredSystemType(sysTypes[i].getName(), true);
 		}
-		else
-		{	
-			SystemBasePlugin.logError("PasswordPersistenceManager.init:  extension point not found", null);
-		}   		
 	}
 		
 	/**