diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index 922354a80614c9fe85dc0918509343dabc381eb7..6c033080d28d4b6915811be9603ae24c1d875c2d 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -79,8 +79,8 @@ $wb["default_dbserver_txt"] = 'Default Database Server';
 $wb["limit_database_txt"] = 'Max. number of Databases';
 $wb["limit_database_error_notint"] = 'The database limit must be a number.';
 $wb["username_error_regex"] = 'The Username contains invalid chracaters.';
-$wb["template_master_txt"] = 'Master';
-$wb["template_additional_txt"] = 'Addon';
+$wb["template_master_txt"] = 'Master template';
+$wb["template_additional_txt"] = 'Addon template';
 $wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
 $wb["web_php_options_txt"] = 'PHP Options';
 ?>
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 49315a7d1f0e76d1d8e8d4ddbde55e41e2739870..f1edc98e9d35c107fcd5c4ee1c297eb047e1ff97 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -1,159 +1,168 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_client">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-				<button class="positive iconstxt icoAdd" type="button" value="Add additional template" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
-				<button class="negative iconstxt icoDelete" type="button" value="Delete additional template" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
-      </div>
-    </fieldset>
-  </div>
-  
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>Limits</legend>
-      <div class="ctrlHolder">
-      	<label for="template_master">{tmpl_var name='template_master_txt'}</label>
-        <select name="template_master" id="template_master" class="selectInput">
-					{tmpl_var name='template_master'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="template_additional">{tmpl_var name='template_additional_txt'}</label>
-        <select name="tpl_add_select" id="tpl_add_select" class="selectInput">
-					{tmpl_var name='tpl_add_select'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
-        <select name="default_mailserver" id="default_mailserver" class="selectInput">
-					{tmpl_var name='default_mailserver'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
-        <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
-        <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
-        <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
-        <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
-        <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
-        <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
-        <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
-        <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
-        <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
-        <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
-        <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
-        <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
-        <select name="default_webserver" id="default_webserver" class="selectInput">
-					{tmpl_var name='default_webserver'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
-        <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='web_php_options_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='web_php_options'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
-        <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
-        <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
-        <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
-        <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='ssh_chroot'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="default_dnsserver">{tmpl_var name='default_dnsserver_txt'}</label>
-        <select name="default_dnsserver" id="default_dnsserver" class="selectInput">
-					{tmpl_var name='default_dnsserver'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
-        <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
-        <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="limit_client">{tmpl_var name='limit_client_txt'}</label>
-        <input name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
-        <select name="default_dbserver" id="default_dbserver" class="selectInput">
-					{tmpl_var name='default_dbserver'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
-        <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-			</div>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+<tmpl_if name="is_admin">
+  <div class="pnl_toolsarea">
+    <fieldset><legend>Tools</legend>
+      <div class="buttons">
+				<button class="positive iconstxt icoAdd" type="button" value="Add additional template" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
+				<button class="negative iconstxt icoDelete" type="button" value="Delete additional template" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
+      </div>
+    </fieldset>
+  </div>
+</tmpl_if>
+  
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels"><legend>Limits</legend>
+<tmpl_if name="is_admin">
+      <div class="ctrlHolder">
+      	<label for="template_master">{tmpl_var name='template_master_txt'}</label>
+        <select name="template_master" id="template_master" class="selectInput">
+					{tmpl_var name='template_master'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="template_additional">{tmpl_var name='template_additional_txt'}</label>
+        <select name="tpl_add_select" id="tpl_add_select" class="selectInput">
+					{tmpl_var name='tpl_add_select'}
+				</select>
+	      <span id="template_additional_list">{tmpl_var name='template_additional_list'}</span>
+	  	  <input type="hidden" id="template_additional" name="template_additional" value="{tmpl_var name='template_additional'}">
+      </div>
+	  <div class="ctrlHolder">
+	    &nbsp;
+	  </div>
+</tmpl_if>
+      <div class="ctrlHolder">
+      	<label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
+        <select name="default_mailserver" id="default_mailserver" class="selectInput">
+					{tmpl_var name='default_mailserver'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
+        <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
+        <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
+        <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
+        <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
+        <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
+        <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
+        <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
+        <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
+        <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+        <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+        <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+        <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
+        <select name="default_webserver" id="default_webserver" class="selectInput">
+					{tmpl_var name='default_webserver'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
+        <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='web_php_options_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='web_php_options'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+        <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
+        <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
+        <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
+        <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='ssh_chroot'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="default_dnsserver">{tmpl_var name='default_dnsserver_txt'}</label>
+        <select name="default_dnsserver" id="default_dnsserver" class="selectInput">
+					{tmpl_var name='default_dnsserver'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
+        <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
+        <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="limit_client">{tmpl_var name='limit_client_txt'}</label>
+        <input name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
+        <select name="default_dbserver" id="default_dbserver" class="selectInput">
+					{tmpl_var name='default_dbserver'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
+        <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+			</div>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+    <div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 8ef6fd3ea99c6b50291ad4e717c0ee53a3ed9df5..7414d722ca25ce296b2849d9c8977abe07092da2 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -410,35 +410,42 @@ function pass_contains(pass, check) {
 	return false;
 }
 
-function addAdditionalTemplate(){
-	var tpl_add = document.getElementById('template_additional').value;
-	var tpl_list = document.getElementById('template_additional_list').innerHTML;
-	var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
-	var addTplId = addTemplate[0];
-	var addTplText = addTemplate[1];
-	var newVal = tpl_add + '/' + addTplId + '/';
-	newVal = newVal.replace('//', '/');
-	var newList = tpl_list + '<br>' + addTplText;
-	newList = newList.replace('<br><br>', '<br>');
-	document.getElementById('template_additional').value = newVal;
-	document.getElementById('template_additional_list').innerHTML = newList;
-	alert('additional template ' + addTplText + ' added to customer');
-}
-
-function delAdditionalTemplate(){
-	var tpl_add = document.getElementById('template_additional').value;
-	if(tpl_add != '') {
-		var tpl_list = document.getElementById('template_additional_list').innerHTML;
-		var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
-		var addTplId = addTemplate[0];
-		var addTplText = addTemplate[1];
-		var newVal = tpl_add;
-		newVal = newVal.replace(addTplId, '');
-		newVal = newVal.replace('//', '/');
-		var newList = tpl_list.replace(addTplText, '');
-		newList = newList.replace('<br><br>', '<br>');
-		document.getElementById('template_additional').value = newVal;
-		document.getElementById('template_additional_list').innerHTML = newList;
-  }
-  alert('additional template ' + addTplText + ' deleted from customer');
-}
+function addAdditionalTemplate(){
+	var tpl_add = document.getElementById('template_additional').value;
+	if(tpl_add != '') {
+	  var tpl_list = document.getElementById('template_additional_list').innerHTML;
+	  var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
+	  var addTplId = addTemplate[0];
+	  var addTplText = addTemplate[1];
+	  var newVal = tpl_add + '/' + addTplId + '/';
+	  newVal = newVal.replace('//', '/');
+	  var newList = tpl_list + '<br>' + addTplText;
+	  newList = newList.replace('<br><br>', '<br>');
+	  document.getElementById('template_additional').value = newVal;
+	  document.getElementById('template_additional_list').innerHTML = newList;
+	  alert('additional template ' + addTplText + ' added to customer');
+	} else {
+	  alert('no additional template selcted');
+	}
+}
+
+function delAdditionalTemplate(){
+	var tpl_add = document.getElementById('template_additional').value;
+	if(tpl_add != '') {
+		var tpl_list = document.getElementById('template_additional_list').innerHTML;
+		var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
+		var addTplId = addTemplate[0];
+		var addTplText = addTemplate[1];
+		var newVal = tpl_add;
+		newVal = newVal.replace(addTplId, '');
+		newVal = newVal.replace('//', '/');
+		var newList = tpl_list.replace(addTplText, '');
+		newList = newList.replace('<br><br>', '<br>');
+		document.getElementById('template_additional').value = newVal;
+		document.getElementById('template_additional_list').innerHTML = newList;
+		alert('additional template ' + addTplText + ' deleted from customer');
+  } else {
+  	alert('no additional template selcted');
+  }
+  
+}