diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 2c2eb25d628daf20fc6fe27d9a6a6685bf7e75ac..29a8c83d44fdbc5b38439098940da947c27f994a 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -8,7 +8,7 @@
       <tmpl_if name="is_admin">
       <div class="ctrlHolder">
       	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
-        <select name="server_id" id="server_id" class="selectInput">
+        <select name="server_id" id="server_id" class="selectInput" {tmpl_var name='edit_disabled'}>
 					{tmpl_var name='server_id'}
 				</select>
       </div>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index 55f4a11420bdd4525d36333eb288e98d67a2f34e..688f33a1a0377cf1327b46473112e59b05f8626c 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -1,132 +1,132 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_web_domain">
-
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-      <tmpl_if name="is_admin">
-      <div class="ctrlHolder">
-      	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
-        <select name="server_id" id="server_id" class="selectInput">
-					{tmpl_var name='server_id'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
-        <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='client_group_id'}
-				</select>
-      </div>
-      </tmpl_if>
-      <tmpl_if name="is_reseller">
-      <div class="ctrlHolder">
-      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
-        <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='client_group_id'}
-				</select>
-      </div>
-      </tmpl_if>
-      <div class="ctrlHolder">
-      	<label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
-        <select name="ip_address" id="ip_address" class="selectInput formLengthIPv4">
-					{tmpl_var name='ip_address'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="domain">{tmpl_var name='domain_txt'}</label>
-        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
-			</div>
-<!--
-      <div class="ctrlHolder">
-      	<label for="type">{tmpl_var name='type_txt'}</label>
-        <select name="type" id="type" class="selectInput">
-					{tmpl_var name='type'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
-        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
-					{tmpl_var name='parent_domain_id'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="vhost_type">{tmpl_var name='vhost_type_txt'}</label>
-        <select name="vhost_type" id="vhost_type" class="selectInput">
-					{tmpl_var name='vhost_type'}
-				</select>
-      </div>
--->
-      <div class="ctrlHolder">
-      	<label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
-        <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
-        <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='cgi_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='cgi'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='ssi_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='ssi'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='suexec_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='suexec'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='errordocs_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='errordocs'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='is_subdomainwww_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='is_subdomainwww'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
-        <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
-					{tmpl_var name='subdomain'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='ssl_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='ssl'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="php">{tmpl_var name='php_txt'}</label>
-        <select name="php" id="php" class="selectInput formLengthHalf">
-					{tmpl_var name='php'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='active_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='active'}
-					</div>
-			</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','sites/web_domain_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('sites/web_domain_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_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels">
+      <tmpl_if name="is_admin">
+      <div class="ctrlHolder">
+      	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
+        <select name="server_id" id="server_id" class="selectInput" {tmpl_var name='edit_disabled'}>
+					{tmpl_var name='server_id'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+        <select name="client_group_id" id="client_group_id" class="selectInput">
+					{tmpl_var name='client_group_id'}
+				</select>
+      </div>
+      </tmpl_if>
+      <tmpl_if name="is_reseller">
+      <div class="ctrlHolder">
+      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+        <select name="client_group_id" id="client_group_id" class="selectInput">
+					{tmpl_var name='client_group_id'}
+				</select>
+      </div>
+      </tmpl_if>
+      <div class="ctrlHolder">
+      	<label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+        <select name="ip_address" id="ip_address" class="selectInput formLengthIPv4">
+					{tmpl_var name='ip_address'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="domain">{tmpl_var name='domain_txt'}</label>
+        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+			</div>
+<!--
+      <div class="ctrlHolder">
+      	<label for="type">{tmpl_var name='type_txt'}</label>
+        <select name="type" id="type" class="selectInput">
+					{tmpl_var name='type'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+					{tmpl_var name='parent_domain_id'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="vhost_type">{tmpl_var name='vhost_type_txt'}</label>
+        <select name="vhost_type" id="vhost_type" class="selectInput">
+					{tmpl_var name='vhost_type'}
+				</select>
+      </div>
+-->
+      <div class="ctrlHolder">
+      	<label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
+        <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+      	<label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
+        <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='cgi_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='cgi'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='ssi_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='ssi'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='suexec_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='suexec'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='errordocs_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='errordocs'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='is_subdomainwww_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='is_subdomainwww'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+        <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+					{tmpl_var name='subdomain'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='ssl_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='ssl'}
+					</div>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="php">{tmpl_var name='php_txt'}</label>
+        <select name="php" id="php" class="selectInput formLengthHalf">
+					{tmpl_var name='php'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='active_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='active'}
+					</div>
+			</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','sites/web_domain_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('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>