diff --git a/modules/configuration/templates/form_configuration.tpl b/modules/configuration/templates/form_configuration.tpl
index 6cde8307d5b..719cce6dd56 100644
--- a/modules/configuration/templates/form_configuration.tpl
+++ b/modules/configuration/templates/form_configuration.tpl
@@ -74,20 +74,29 @@
     <div class="config-form-group" id="{$node['ID']}">
     {foreach from=$node['Value'] key=k item=v}
         {if $node['AllowMultiple'] == 1}<div class="input-group entry">{/if}
+
+        {if $k == 0}
+            {assign var=id value={"add-"|cat:$node['ID']} }
+        {else}
+            {assign var=id value=$k}
+        {/if}
+
         {if $node['DataType'] eq 'boolean'}
-            {call createRadio k=$k v=$v d=$node['Disabled']}
+            {call createRadio k=$id v=$v d=$node['Disabled']}
         {elseif $node['DataType'] eq 'instrument'}
-            {call createInstrument k=$k v=$v d=$node['Disabled']}
+            {call createInstrument k=$id v=$v d=$node['Disabled']}
         {elseif $node['DataType'] eq 'scan_type'}
-            {call createScanType k=$k v=$v d=$node['Disabled']}
+            {call createScanType k=$id v=$v d=$node['Disabled']}
+        {elseif $node['DataType'] eq 'date_format'}
+            {call createDateFormat k=$id v=$v d=$node['Disabled']}
         {elseif $node['DataType'] eq 'email'}
-            {call createEmail k=$k v=$v d=$node['Disabled']}
+            {call createEmail k=$id v=$id d=$node['Disabled']}
         {elseif $node['DataType'] eq 'textarea'}
-            {call createTextArea k=$k v=$v d=$node['Disabled']}
+            {call createTextArea k=$id v=$v d=$node['Disabled']}
         {elseif $node['DataType'] eq 'lookup_center'}
-            {call createLookUpCenterNameUsing k=$k v=$v d=$node['Disabled']}
+            {call createLookUpCenterNameUsing k=$id v=$v d=$node['Disabled']}
         {else}
-            {call createText k=$k v=$v d=$node['Disabled']}
+            {call createText k=$id v=$v d=$node['Disabled']}
         {/if}
         {if $node['AllowMultiple'] == 1}
             <div class="input-group-btn">