diff --git a/server/src/main/java/org/gluu/oxtrust/action/ConfigureNameIdAction.java b/server/src/main/java/org/gluu/oxtrust/action/ConfigureNameIdAction.java
index 6cae99812..6a298029e 100644
--- a/server/src/main/java/org/gluu/oxtrust/action/ConfigureNameIdAction.java
+++ b/server/src/main/java/org/gluu/oxtrust/action/ConfigureNameIdAction.java
@@ -194,12 +194,8 @@ public void removeNameIdConfig(NameIdConfig removenameIdConfig) {
 	}
 
 	public Map<String, String> getAvailableNamedIds(NameIdConfig config) {
-		MapDifference<String, String> diff = Maps.difference(availableNamedIds, usedNamedIds);
-		Map<String, String> value = diff.entriesOnlyOnLeft();
-		Map<String, String> result = Maps.newHashMap(value);
-		if (config.getNameIdType() != null) {
-			result.put(config.getNameIdType(), config.getNameIdType());
-		}
+		
+		Map<String, String> result = Maps.newHashMap(availableNamedIds);
 		return result;
 	}