diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index bf22cdaf917f8a432ba0efc82cdbb9268b4b70aa..477e0b7b69aa0c010210756c875fa31450ca9724 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -111,6 +111,13 @@ class page_action extends tform_actions {
 		unset($policy_select);
 		unset($tmp_user);
 		
+		if($this->id > 0) {
+			//* we are editing a existing record
+			$app->tpl->setVar("edit_disabled", 'disabled="disabled"');
+		} else {
+			$app->tpl->setVar("edit_disabled", '');
+		}
+		
 		parent::onShowEnd();
 	}
 	
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 64332fbc520ab2a66b5f2cfe4189be42fa148437..62174947ea37aadca2f2f8ab8d20778d616eaa3b 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -1,49 +1,49 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_mail_domain">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_mail_domain"><legend>Domain</legend>
-
-      <tmpl_if name="is_admin">
-      <span class="wf_oneField">
-        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
-        <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
-        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
-      </span>
-      </tmpl_if>
-      
-      <tmpl_if name="is_reseller">
-      <span class="wf_oneField">
-        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
-        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
-      </span>
-      </tmpl_if>
-      
-      <span class="wf_oneField">
-        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
-        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="policy" class="wf_preField">{tmpl_var name='policy_txt'}</label>
-        <select id="policy" name="policy">{tmpl_var name='policy'}</select>
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="type" value="local">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_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('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_mail_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_mail_domain"><legend>Domain</legend>
+
+      <tmpl_if name="is_admin">
+      <span class="wf_oneField">
+        <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+        <select id="server_id" name="server_id" {tmpl_var name='edit_disabled'}>{tmpl_var name='server_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      
+      <tmpl_if name="is_reseller">
+      <span class="wf_oneField">
+        <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+        <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+      </span>
+      </tmpl_if>
+      
+      <span class="wf_oneField">
+        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="policy" class="wf_preField">{tmpl_var name='policy_txt'}</label>
+        <select id="policy" name="policy">{tmpl_var name='policy'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="type" value="local">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_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('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index 0a92965e741e1e23bbbad5762fec7d096cfa9d93..e79557246dc16d2642b9f06d0e32f1cd85bb11d0 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -7,7 +7,7 @@
       <tmpl_if name="is_admin">
       <span class="wf_oneField">
         <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
-        <select id="server_id" name="server_id" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">{tmpl_var name='server_id'}</select>
+        <select id="server_id" name="server_id" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)" {tmpl_var name='edit_disabled'}>{tmpl_var name='server_id'}</select>
       </span>
       <span class="wf_oneField">
         <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 63854fa960990b9387b85ce9e4f178b08e552b88..15c8fa81bed3a0c8af3300a66330c539ad90cb14 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -185,6 +185,13 @@ class page_action extends tform_actions {
 			
 		}
 		
+		if($this->id > 0) {
+			//* we are editing a existing record
+			$app->tpl->setVar("edit_disabled", 'disabled="disabled"');
+		} else {
+			$app->tpl->setVar("edit_disabled", '');
+		}
+		
 		parent::onShowEnd();
 	}