diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IBMServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IBMServerLauncher.java
index c7b26ea6d98..e37240dadad 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IBMServerLauncher.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IBMServerLauncher.java
@@ -15,6 +15,7 @@
  ********************************************************************************/
 
 package org.eclipse.rse.core.subsystems;
+import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.rse.core.internal.subsystems.IBMServerLauncherConstants;
@@ -130,7 +131,10 @@ public class IBMServerLauncher extends ServerLauncher implements IIBMServerLaunc
 		{
 			// for persistence
 			_serverLauncherEnumType = new PropertyType(IPropertyType.TYPE_ENUM);
-			List values = ServerLaunchType.VALUES;
+			List values = Arrays.asList(getSupportedLauncherEnumTypes());
+				// DKM - only need supported types 
+				/// ServerLaunchType.VALUES;
+			
 			String[] enumValues = new String[values.size()];
 			for (int i = 0; i < values.size(); i++)
 			{
@@ -142,6 +146,15 @@ public class IBMServerLauncher extends ServerLauncher implements IIBMServerLaunc
 		return _serverLauncherEnumType;
 	}
 	
+	protected ServerLaunchType[] getSupportedLauncherEnumTypes()
+	{
+		return new ServerLaunchType[]
+		                  {
+		ServerLaunchType.DAEMON_LITERAL,
+		ServerLaunchType.REXEC_LITERAL,
+		ServerLaunchType.RUNNING_LITERAL
+		                  };
+	}
 	
 	public void restoreFromProperties()
 	{