diff --git a/install/update.php b/install/update.php
index 8c4bb1511385d614a6f761c8449d84d04c972f9c..6047b7b9302f9841b181c6b7b5c2ec5f71153866 100644
--- a/install/update.php
+++ b/install/update.php
@@ -367,30 +367,41 @@ $inst->find_installed_apps();
 if ($conf['mysql']['master_slave_setup'] == 'y') $current_svc_config = $inst->dbmaster->queryOneRecord("SELECT mail_server,web_server,dns_server,xmpp_server,firewall_server,vserver_server,db_server FROM ?? WHERE server_id=?", $conf['mysql']['master_database'] . '.server', $conf['server_id']);
 else $current_svc_config = $inst->db->queryOneRecord("SELECT mail_server,web_server,dns_server,xmpp_server,firewall_server,vserver_server,db_server FROM ?? WHERE server_id=?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
 
+if(isset($conf['postfix']['installed']) && $conf['postfix']['installed'] == true) {
+	$conf['services']['mail'] = check_service_config_state('mail_server', true);
+} else {
+	$conf['services']['mail'] = check_service_config_state('mail_server', false);
+}
 
-if(isset($conf['postfix']['installed']) && $conf['postfix']['installed'] == true)
-$conf['services']['mail'] = check_service_config_state('mail_server', true);
-else $conf['services']['mail'] = check_service_config_state('mail_server', false);
-
-if(isset($conf['powerdns']['installed']) && $conf['powerdns']['installed'] == true || isset($conf['bind']['installed']) && $conf['bind']['installed'] == true || isset($conf['mydns']['installed']) && $conf['mydns']['installed'] == true)
-$conf['services']['dns'] = check_service_config_state('dns_server', true);
-else $conf['services']['dns'] = check_service_config_state('dns_server', false);
+if(isset($conf['powerdns']['installed']) && $conf['powerdns']['installed'] == true || isset($conf['bind']['installed']) && $conf['bind']['installed'] == true || isset($conf['mydns']['installed']) && $conf['mydns']['installed'] == true) {
+	$conf['services']['dns'] = check_service_config_state('dns_server', true);
+} else {
+	$conf['services']['dns'] = check_service_config_state('dns_server', false);
+}
 
-if(isset($conf['apache']['installed']) && $conf['apache']['installed'] == true || isset($conf['nginx']['installed']) && $conf['nginx']['installed'] == true)
-$conf['services']['web'] = check_service_config_state('web_server', true);
-else $conf['services']['web'] = check_service_config_state('web_server', false);
+if(isset($conf['apache']['installed']) && $conf['apache']['installed'] == true || isset($conf['nginx']['installed']) && $conf['nginx']['installed'] == true) {
+	$conf['services']['web'] = check_service_config_state('web_server', true);
+} else { 
+	$conf['services']['web'] = check_service_config_state('web_server', false);
+}
 
-if(isset($conf['xmpp']['installed']) && $conf['xmpp']['installed'] == true)
-$conf['services']['xmpp'] = check_service_config_state('xmpp_server', true);
-else $conf['services']['xmpp'] = check_service_config_state('xmpp_server', false);
+if(isset($conf['xmpp']['installed']) && $conf['xmpp']['installed'] == true) {
+	$conf['services']['xmpp'] = check_service_config_state('xmpp_server', true);
+} else { 
+	$conf['services']['xmpp'] = check_service_config_state('xmpp_server', false);
+}
 
-if(isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true || isset($conf['firewall']['installed']) && $conf['firewall']['installed'] == true)
-$conf['services']['firewall'] = check_service_config_state('firewall_server', true);
-else $conf['services']['firewall'] = check_service_config_state('firewall_server', false);
+if(isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true || isset($conf['firewall']['installed']) && $conf['firewall']['installed'] == true) {
+	$conf['services']['firewall'] = check_service_config_state('firewall_server', true);
+} else { 
+	$conf['services']['firewall'] = check_service_config_state('firewall_server', false);
+}
 
-if(isset($conf['vserver']['installed']) && $conf['vserver']['installed'] == true)
-$conf['services']['vserver'] = check_service_config_state('vserver_server', true);
-else $conf['services']['vserver'] = check_service_config_state('vserver_server', false);
+if(isset($conf['vserver']['installed']) && $conf['vserver']['installed'] == true) {
+	$conf['services']['vserver'] = check_service_config_state('vserver_server', true);
+} else { 
+	$conf['services']['vserver'] = check_service_config_state('vserver_server', false);
+}
 
 $conf['services']['db'] = check_service_config_state('db_server', true); /* Will always offer as MySQL is of course installed on this host as it's a requirement for ISPC to work... */
 unset($current_svc_config);