diff --git a/server/server.php b/server/server.php
index 1cbdec7778ea94ddf4c2abb2f31d88f42c7c6692..e11e03834f92dda4695f0264f48861af8f052907 100644
--- a/server/server.php
+++ b/server/server.php
@@ -49,13 +49,14 @@ if($server_db_record == false) {
 }
 */
 
-/*
+
 // Check if another process is running
 if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
   clearstatcache();
-  for($i=0;$i<120;$i++){ // Wait max. 120 sec, then proceed
+  for($i=0;$i<120;$i++){ // Wait max. 1200 sec, then proceed
     if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
-      sleep(1);
+	  $app->log("There is already a lockfile set. Waiting another 10 seconds...", LOGLEVEL_DEBUG);
+      sleep(10);
       clearstatcache();
     }
   }
@@ -64,7 +65,7 @@ if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
 // Set Lockfile
 @touch($conf["temppath"].$conf["fs_div"].".ispconfig_lock");
 $app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGLEVEL_DEBUG);
-*/
+
 
 if($app->dbmaster->connect()) {
 
@@ -116,11 +117,11 @@ if($app->dbmaster->connect()) {
 	$app->log("Unable to connect to master server.",LOGLEVEL_ERROR);
 }
 
-/*
+
 // Remove lock
 @unlink($conf["temppath"].$conf["fs_div"].".ispconfig_lock");
 $app->log("Remove Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock",LOGLEVEL_DEBUG);
-*/
+
 
 die("finished.\n");
 ?>
\ No newline at end of file