diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 75a013b81123881a40d34f9a8a5a152896c0a446..51a7a66bd9c76f1d612b56c75dea5ca90257ce95 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -63,7 +63,7 @@ if(count($_POST) > 0) {
 	if(!preg_match("/^.{1,256}$/i", $_POST['password'])) $error = $app->lng('pw_error_length');
 
 	//** importing variables
-	$ip    = ip2long($_SERVER['REMOTE_ADDR']);
+	$ip = md5($_SERVER['REMOTE_ADDR']);
 	$username = $_POST['username'];
 	$password = $_POST['password'];
 	$loginAs  = false;
@@ -262,7 +262,7 @@ if(count($_POST) > 0) {
 						$app->plugin->raiseEvent('login', $this);
 						
 						//* Save successfull login message to var
-						$authlog = 'Successful login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
+						$authlog = 'Successful login for user \''. $username .'\' from '. $_SERVER['REMOTE_ADDR'] .' at '. date('Y-m-d H:i:s');
 						$authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
 						fwrite($authlog_handle, $authlog ."\n");
 						fclose($authlog_handle);
@@ -300,7 +300,7 @@ if(count($_POST) > 0) {
 
 				$app->plugin->raiseEvent('login_failed', $this);
 				//* Save failed login message to var
-				$authlog = 'Failed login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
+				$authlog = 'Failed login for user \''. $username .'\' from '. $_SERVER['REMOTE_ADDR'] .' at '. date('Y-m-d H:i:s');
 				$authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
 				fwrite($authlog_handle, $authlog ."\n");
 				fclose($authlog_handle);
diff --git a/interface/web/mail/list/xmpp_user.list.php b/interface/web/mail/list/xmpp_user.list.php
index c1cdbb8d4d36b3282d7de9d6417982854e8e4171..075e7c4554ff5df6179069ba9ed9beddd86a0db7 100644
--- a/interface/web/mail/list/xmpp_user.list.php
+++ b/interface/web/mail/list/xmpp_user.list.php
@@ -47,7 +47,7 @@ $liste["auth"]   = "yes";
 * Suchfelder
 *****************************************************/
 
-$liste["item"][] = array(   'field'     => "JID",
+$liste["item"][] = array(   'field'     => "jid",
 	'datatype'  => "VARCHAR",
 	'filters'   => array( 0 => array( 'event' => 'SHOW',
 			'type' => 'IDNTOUTF8')
diff --git a/interface/web/mail/xmpp_domain_edit.php b/interface/web/mail/xmpp_domain_edit.php
index 3f62dbdb03c6ce244af2f436bdd5073adb79a59d..aaa8d640e8ae69e28aa426665e6aca7d563fa8e0 100644
--- a/interface/web/mail/xmpp_domain_edit.php
+++ b/interface/web/mail/xmpp_domain_edit.php
@@ -402,7 +402,7 @@ class page_action extends tform_actions {
         //    $this->desyncMailusers($this->dataRecord['domain']);
         // Update DNS Records
         // TODO: Update gets only triggered from main form. WHY?
-        $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM dns_soa WHERE active = 'Y' AND `origin` = ?", $this->dataRecord['domain'].'.');
+        $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id FROM dns_soa WHERE active = 'Y' AND `origin` = ?", $this->dataRecord['domain'].'.');
         if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
 	}
 
diff --git a/server/conf/metronome_conf_host.master b/server/conf/metronome_conf_host.master
index 179d533e19c532bdc498d938406a962cf877c437..3dea69257bc8cc2b637570196500ff64df24f1ea 100644
--- a/server/conf/metronome_conf_host.master
+++ b/server/conf/metronome_conf_host.master
@@ -59,7 +59,7 @@ VirtualHost "{tmpl_var name='domain'}"
         };
 </tmpl_if>
 
-<tmpl_if name='use_proxy' op='==' value='true'>
+<tmpl_if name='use_anon_host' op='==' value='true'>
 VirtualHost "anon.{tmpl_var name='domain'}"
         enabled = true;
         authentication = "anonymous";