diff --git a/templates/creation/courierMailAccount.xml b/templates/creation/courierMailAccount.xml
index 43bd3cb..b7602ab 100644
--- a/templates/creation/courierMailAccount.xml
+++ b/templates/creation/courierMailAccount.xml
@@ -60,7 +60,7 @@
 	<order>7</order>
 	<page>1</page>
 	<spacer>1</spacer>
-	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%)]]></value>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%;;;;cn)]]></value>
 </attribute>
 <attribute id="homeDirectory">
 	<display>Home Directory</display>
diff --git a/templates/creation/posixAccount.xml b/templates/creation/posixAccount.xml
index 1d6c5a9..2931c1e 100644
--- a/templates/creation/posixAccount.xml
+++ b/templates/creation/posixAccount.xml
@@ -64,13 +64,13 @@
 	<!-- <onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange> -->
 	<order>7</order>
 	<page>1</page>
-	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%)]]></value>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%;;;;cn)]]></value>
 </attribute>
 <attribute id="loginShell">
 	<display>Login shell</display>
 	<order>9</order>
 	<page>1</page>
-	<!-- <value><![CDATA[=php.PickList(/;(&(objectClass=posixAccount));loginShell;%loginShell%)]]></value> -->
+	<!-- <value><![CDATA[=php.PickList(/;(&(objectClass=posixAccount));loginShell;%loginShell%;;;;loginShell)]]></value> -->
 	<type>select</type>
 	<value id="/bin/sh">/bin/sh</value>
 	<value id="/bin/csh">/bin/csh</value>
diff --git a/templates/creation/sambaGroupMapping.xml b/templates/creation/sambaGroupMapping.xml
index c288f95..4feaee5 100644
--- a/templates/creation/sambaGroupMapping.xml
+++ b/templates/creation/sambaGroupMapping.xml
@@ -44,7 +44,7 @@
 	<order>4</order>
 	<post>=php.Join(-;%sambaSID%,%sidsuffix%)</post>
 	<page>1</page>
-	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaDomain));sambaSID;%sambaSID% (%sambaDomainName%))]]></value>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaDomain));sambaSID;%sambaSID% (%sambaDomainName%));;;;sambaDomainName]]></value>
 </attribute>
 <attribute id="sambaGroupType">
 	<display>Samba Group Type</display>
diff --git a/templates/creation/sambaMachine.xml b/templates/creation/sambaMachine.xml
index 663fee1..fe5e5d3 100644
--- a/templates/creation/sambaMachine.xml
+++ b/templates/creation/sambaMachine.xml
@@ -37,7 +37,7 @@
 	<display>GID Number</display>
 	<order>3</order>
 	<page>1</page>
-	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%)]]></value>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%;;;;cn)]]></value>
 </attribute>
 <attribute id="sambaSID">
 	<display>Samba SID</display>
@@ -48,7 +48,7 @@
 	<order>2</order>
 	<page>1</page>
 	<post>=php.Join(-;%sambaSID%,%sidsuffix%)</post>
-	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaDomain));sambaSID;%sambaSID% (%sambaDomainName%))]]></value>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaDomain));sambaSID;%sambaSID% (%sambaDomainName%);;;;sambaDomainName)]]></value>
 </attribute>
 <attribute id="sambaAcctFlags">
 	<hidden>1</hidden>
diff --git a/templates/creation/sambaSamAccount.xml b/templates/creation/sambaSamAccount.xml
index 548e415..d44fad8 100644
--- a/templates/creation/sambaSamAccount.xml
+++ b/templates/creation/sambaSamAccount.xml
@@ -43,7 +43,7 @@
 	<onchange>=autoFill(uid;%gidNumber|0-0/T%-%givenName|0-1/l%%sn/l%)</onchange>
 	<order>4</order>
 	<page>1</page>
-	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%)]]></value>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%;;;;cn)]]></value>
 </attribute>
 <attribute id="uid">
 	<display>User ID</display>
@@ -69,7 +69,7 @@
 	<page>1</page>
 	<post>=php.Join(-;%sambaSID%,%sidsuffix%)</post>
 	<spacer>1</spacer>
-	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaDomain));sambaSID;%sambaSID% (%sambaDomainName%))]]></value>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaDomain));sambaSID;%sambaSID% (%sambaDomainName%);;;;sambaDomainName)]]></value>
 </attribute>
 <attribute id="userPassword">
 	<display>Password</display>
@@ -117,7 +117,7 @@
 	<page>1</page>
 	<post>=php.Join(-;%sambaPrimaryGroupSID%,%sidpgsuffix%)</post>
 	<spacer>1</spacer>
-	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaGroupMapping));sambaSID;%sambaSID% (%cn%);sambaPrimaryGroupSID)]]></value>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaGroupMapping));sambaSID;%sambaSID% (%cn%);sambaPrimaryGroupSID;;;;cn)]]></value>
 </attribute>
 <attribute id="homeDirectory">
 	<display>Home directory</display>