diff --git a/install/update.php b/install/update.php
index 616bef6a26ec2b8d278ba25571018702c1a26cbc..3311272a2c7ecfea2b6602f84208b77c5ca27046 100644
--- a/install/update.php
+++ b/install/update.php
@@ -524,11 +524,10 @@ if ($inst->install_ispconfig_interface) {
 	}
 }
 
-// Create SSL certs for non-webserver(s) ?
-if(($conf['apache']['installed'] && $conf['apache']['installed']) == false) {
-    if(strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y')) == 'y') {
+// Create SSL certs for non-webserver(s)?
+if(!file_exists(/usr/local/ispconfig/interface/ssl/ispserver.crt)) {
+    if(strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y')) == 'y')
         $inst->make_ispconfig_ssl_cert();
-    }
 }
 
 $inst->install_ispconfig();