diff --git a/server/src/main/webapp/WEB-INF/incl/person/userForm.xhtml b/server/src/main/webapp/WEB-INF/incl/person/userForm.xhtml
index a3eaff354..ac04d9e88 100644
--- a/server/src/main/webapp/WEB-INF/incl/person/userForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/person/userForm.xhtml
@@ -81,7 +81,7 @@
value="#{_customAttributeAction.attributeIds[_custAttr.metadata]}"/>
+ rendered="#{((_custAttr.adminCanEdit or _mustEnter) and (_custAttr.metadata.dataType.value eq 'boolean') and (_custAttr.metadata.displayName ne 'User Status') and (_custAttr.metadata.name ne 'oxTrustActive')) }">
diff --git a/server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml b/server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml
index b7b35b82f..479d30976 100644
--- a/server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml
@@ -84,7 +84,7 @@
@@ -94,6 +94,7 @@
+ style="width: 703px; height: 185px;" width="703" />
diff --git a/service/pom.xml b/service/pom.xml
index 902cf9c87..1b8d48555 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -10,7 +10,7 @@