diff --git a/lib/class.ISPConfigLog.inc.php b/lib/class.ISPConfigLog.inc.php
index e4dbc1d6e871f6b4be5469cefe56206639d9fa9c..c5cf930d3571a176000a11270d9ee50e97855256 100644
--- a/lib/class.ISPConfigLog.inc.php
+++ b/lib/class.ISPConfigLog.inc.php
@@ -150,7 +150,7 @@ class ISPConfigLog {
 		if(!$fp) {
 			throw new ISPConfigLogException('Could not open logfile ' . $log_file . '.');
 		}
-		if(!@fwrite($fp, strftime("%d.%m.%Y-%H:%M:%S", time()) . ' - ' . $caller['file'] . ':' . $caller['line'] . ': [' . self::PRIORITY_TEXT[$priority] . '] ' . PXBashColor::getCleanString($message) . "\n")) {
+		if(!@fwrite($fp, date('d.m.Y-H:i:s') . ' - ' . $caller['file'] . ':' . $caller['line'] . ': [' . self::PRIORITY_TEXT[$priority] . '] ' . PXBashColor::getCleanString($message) . "\n")) {
 			throw new ISPConfigLogException('Could not write to logfile ' . $log_file . '.');
 		}
 		fclose($fp);
diff --git a/lib/os/class.ISPConfigBaseOS.inc.php b/lib/os/class.ISPConfigBaseOS.inc.php
index 8d06c441f340c17da21a72228406dd446a69a7fd..6b27e6d3277f98089d06a6d8d81f12a9cbe156a5 100644
--- a/lib/os/class.ISPConfigBaseOS.inc.php
+++ b/lib/os/class.ISPConfigBaseOS.inc.php
@@ -224,7 +224,7 @@ class ISPConfigBaseOS {
 		unset($new_lines);
 		unset($lines);
 
-		copy($file, $file . '~' . strftime('%Y%m%d%H%M%S', time()));
+		copy($file, $file . '~' . date('YmdHis'));
 		file_put_contents($file, $content);
 		return true;
 	}
@@ -314,7 +314,7 @@ class ISPConfigBaseOS {
 			}
 
 		}
-		copy($file, $file . '~' . strftime('%Y%m%d%H%M%S', time()));
+		copy($file, $file . '~' . date('YmdHis'));
 		file_put_contents($file, $content);
 
 		return true;
diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php
index 309971d27cbb89ca0ccfaa9955f4b7a500590496..abb95db666e94228e47e5fd750d1590372a6145a 100644
--- a/lib/os/class.ISPConfigDebianOS.inc.php
+++ b/lib/os/class.ISPConfigDebianOS.inc.php
@@ -1243,7 +1243,7 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 	}
 
 	public function runPerfectSetup() {
-		$log_filename = 'setup-' . strftime('%Y%m%d%H%M%S', time()) . '.log';
+		$log_filename = 'setup-' . date('YmdHis') . '.log';
 		ISPConfigLog::setLogFile($log_filename);
 
 		if(is_file('/usr/local/ispconfig/server/lib/config.inc.php')) {