diff --git a/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java b/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java
index 08ad3e3e5..a33b1dc28 100644
--- a/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java
+++ b/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java
@@ -1163,6 +1163,7 @@ private void updateCustomScripts() {
     	}
     	if(!this.client.getAttributes().getIntrospectionScripts().contains(introspectionCustomScript)
     			&&  !introspectionCustomScript.isEmpty()) {
+            this.client.getAttributes().getIntrospectionScripts().clear();
     		this.client.getAttributes().getIntrospectionScripts().add(introspectionCustomScript);
     	}
     	if(!this.client.getAttributes().getSpontaneousScopeScriptDns().contains(spontaneousScopeCustomScript)
diff --git a/server/src/main/webapp/WEB-INF/incl/client/clientForm.xhtml b/server/src/main/webapp/WEB-INF/incl/client/clientForm.xhtml
index d7a6d136c..3971cacc7 100644
--- a/server/src/main/webapp/WEB-INF/incl/client/clientForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/client/clientForm.xhtml
@@ -1355,7 +1355,7 @@
 													
 												<h:selectOneMenu styleClass="col-sm-9 form-control rounded" 
 														value="#{_clientAction.introspectionCustomScript}"
-														id="spontaneousScopeScriptsId" required="false">
+														id="introspectionScriptsId" required="false">
 														<f:selectItem noSelectionOption="true" itemLabel="" />
 														<f:selectItems
 															value="#{_clientAction.searchAvailableCustomScriptsforintrospection()}"