diff --git a/docs/INSTALL_OPENSUSE_11_1.txt b/docs/INSTALL_OPENSUSE_11_1.txt
index b755dae627e7e0029915e1d798e19a2d598e603b..3d2c6231c2eac183aa6f6095cdb3c1959a4f19d1 100644
--- a/docs/INSTALL_OPENSUSE_11_1.txt
+++ b/docs/INSTALL_OPENSUSE_11_1.txt
@@ -43,8 +43,9 @@ chkconfig --add courier-imap-ssl
 
 cd /tmp
 
-wget http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/src/phpMyAdmin-3.1.2-1.1.src.rpm
-rpm -i phpMyAdmin-3.1.2-1.1.src.rpm
+yast2 -i pwgen
+rpm -i http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/noarch/phpMyAdmin-3.1.2-1.1.noarch.rpm
+ln -s /srv/www/htdocs/phpMyAdmin /usr/local/ispconfig/interface/web/phpmyadmin
 
 // Warnings like "warning: phpMyAdmin-3.1.2-1.1.src.rpm: Header V3 DSA signature: NOKEY, key ID 367fe7fc" can be ignored.
 
@@ -67,15 +68,10 @@ make install
 rm -rf pam_mysql-0.7RC1
 rm pam_mysql-0.7RC1.tar.gz
 
+
 // Set the mysql database password:
 
 mysqladmin -u root password yourrootsqlpassword
-mysqladmin -h ispconfig.local -u root password yourrootsqlpassword
-
-
-// Install phpmyadmin
-yast2 -i pwgen
-rpm -i http://download.opensuse.org/repositories/server:/php:/applications/openSUSE_11.1/noarch/phpMyAdmin-3.1.2-1.1.noarch.rpm
 
 
 2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
@@ -185,6 +181,9 @@ Now start the installation process by executing:
 
 php -q install.php
 
+// Cleanup
+rm -rf /tmp/trunk
+
 The installer will configure all services like postfix, sasl, courier, etc. for you. A manual setup as required for ISPConfig 2 (perfect setup guides) is not nescessary. To login to the ISPConfig controlpanel, open the following URL in your browser (replace the IP to match your settings!):
 
 http://192.168.0.100:8080/
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index 477e0b7b69aa0c010210756c875fa31450ca9724..a7b2da1369641967fd10ccdac0913571edc2793f 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -113,9 +113,10 @@ class page_action extends tform_actions {
 		
 		if($this->id > 0) {
 			//* we are editing a existing record
-			$app->tpl->setVar("edit_disabled", 'disabled="disabled"');
+			$app->tpl->setVar("edit_disabled", 1);
+			$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
 		} else {
-			$app->tpl->setVar("edit_disabled", '');
+			$app->tpl->setVar("edit_disabled", 0);
 		}
 		
 		parent::onShowEnd();
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 29a8c83d44fdbc5b38439098940da947c27f994a..a104827f8f248749f41ec91ffb4be567d6db509e 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -7,10 +7,18 @@
     <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>
+      	<tmpl_if name="edit_disabled">
+		<label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+		<select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+		  {tmpl_var name='server_id'}
+		</select>
+		<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+		<tmpl_else>
+		<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>
+		</tmpl_if>
       </div>
       <div class="ctrlHolder">
       	<label for="client_group_id">{tmpl_var name='client_txt'}</label>
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 377f321e553ad35a9743c1286ea7ee97525f3e2e..28f62f6eca62294f0f0f1ed1b1f0c3b577b522a2 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -176,9 +176,11 @@ class page_action extends tform_actions {
 		
 		if($this->id > 0) {
 			//* we are editing a existing record
-			$app->tpl->setVar("edit_disabled", 'disabled="disabled"');
+			$app->tpl->setVar("edit_disabled", 1);
+			$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
+			$app->tpl->setVar("database_charset_value", $this->dataRecord["database_charset"]);
 		} else {
-			$app->tpl->setVar("edit_disabled", '');
+			$app->tpl->setVar("edit_disabled", 0);
 		}
 
 		parent::onShowEnd();
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 463c1b130f050cf21a13ec5a9d110a76713565ec..65df96c323c51965eb3a4744a7d83b869db0b71a 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -7,16 +7,24 @@
     <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>
+      	<tmpl_if name="edit_disabled">
+		<label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+		<select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+		  {tmpl_var name='server_id'}
+		</select>
+		<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+		<tmpl_else>
+		<label for="server_id">{tmpl_var name='server_id_txt'}</label>
+        <select name="server_id" id="server_id" class="selectInput" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+		  {tmpl_var name='server_id'}
+		</select>
+		</tmpl_if>
       </div>
       <div class="ctrlHolder">
       	<label for="client_group_id">{tmpl_var name='client_txt'}</label>
         <select name="client_group_id" id="client_group_id" class="selectInput">
 					{tmpl_var name='client_group_id'}
-				</select>
+		</select>
       </div>
       </tmpl_if>
       <tmpl_if name="is_reseller">
@@ -24,20 +32,25 @@
       	<label for="client_group_id">{tmpl_var name='client_txt'}</label>
         <select name="client_group_id" id="client_group_id" class="selectInput">
 					{tmpl_var name='client_group_id'}
-				</select>
+		</select>
       </div>
       </tmpl_if>
       <div class="ctrlHolder">
       	<label for="type">{tmpl_var name='type_txt'}</label>
         <select name="type" id="type" class="selectInput formLengthHalf">
 					{tmpl_var name='type'}
-				</select>
+		</select>
       </div>
       <div class="ctrlHolder">
       	<label for="database_name">{tmpl_var name='database_name_txt'}</label>
       	<div style="float: left;">{tmpl_var name='database_name_prefix'} </div>
-        <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" {tmpl_var name='edit_disabled'} />
-			</div>
+		<tmpl_if name="edit_disabled">
+		<input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" disabled="disabled" />
+		<input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
+		<tmpl_else>
+        <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+		</tmpl_if>
+		</div>
       <div class="ctrlHolder">
       	<label for="database_user">{tmpl_var name='database_user_txt'}</label>
       	<div style="float: left;">{tmpl_var name='database_user_prefix'} </div>
@@ -53,10 +66,18 @@
 				<p class="formHint"><span id="passText">&nbsp;</span></p>
 			</div>
       <div class="ctrlHolder">
-      	<label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
-        <select name="database_charset" id="database_charset" class="selectInput formLengthHalf" {tmpl_var name='edit_disabled'}>
-					{tmpl_var name='database_charset'}
-				</select>
+	    <tmpl_if name="edit_disabled">
+		<label for="database_charset_disabled">{tmpl_var name='database_charset_txt'}</label>
+		<select name="database_charset_disabled" id="database_charset_disabled" class="selectInput formLengthHalf" disabled="disabled">
+		  {tmpl_var name='database_charset'}
+		</select>
+		<input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
+		<tmpl_else>
+		<label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
+        <select name="database_charset" id="database_charset" class="selectInput formLengthHalf">
+		  {tmpl_var name='database_charset'}
+		</select>
+		</tmpl_if>
       </div>
       <div class="ctrlHolder">
 				<p class="label">{tmpl_var name='remote_access_txt'}</p>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index fe7a38bdafe9261c437f18b9931f43760528ea2f..d377b0421a03dc7edfe8da838cd713153cc1662f 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -7,10 +7,18 @@
     <fieldset class="inlineLabels">
       <tmpl_if name="is_admin">
       <div class="ctrlHolder">
-      	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
+		<tmpl_if name="edit_disabled">
+		<label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+		<select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+		  {tmpl_var name='server_id'}
+		</select>
+		<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+		<tmpl_else>
+		<label for="server_id">{tmpl_var name='server_id_txt'}</label>
         <select name="server_id" id="server_id" class="selectInput" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
-					{tmpl_var name='server_id'}
-				</select>
+		  {tmpl_var name='server_id'}
+		</select>
+		</tmpl_if>
       </div>
       <div class="ctrlHolder">
       	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
@@ -37,26 +45,6 @@
       	<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" />
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 15c8fa81bed3a0c8af3300a66330c539ad90cb14..d9d210f9d9fb28b97ad3346629e7d05652b243c8 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -187,9 +187,10 @@ class page_action extends tform_actions {
 		
 		if($this->id > 0) {
 			//* we are editing a existing record
-			$app->tpl->setVar("edit_disabled", 'disabled="disabled"');
+			$app->tpl->setVar("edit_disabled", 1);
+			$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
 		} else {
-			$app->tpl->setVar("edit_disabled", '');
+			$app->tpl->setVar("edit_disabled", 0);
 		}
 		
 		parent::onShowEnd();