diff --git a/public_html/deployment/classes/actionlog.class.php b/public_html/deployment/classes/actionlog.class.php
index 2a123e67701de8ee08be35b073f22b5b2250acb2..a094e1e55fc6ff1190ddd1dc68782f30e88c5ac9 100644
--- a/public_html/deployment/classes/actionlog.class.php
+++ b/public_html/deployment/classes/actionlog.class.php
@@ -49,7 +49,7 @@ class Actionlog {
             $this->_sUser = $_SERVER["PHP_AUTH_USER"] . " (web)";
         } else {
             $this->_sIP = 'local';
-            $this->_sUser = get_current_user() . " (system)";
+            $this->_sUser = posix_getpwuid(posix_geteuid()) . " (system)";
         }
     }
 
diff --git a/shellscripts/cron_cache_gitbranches.php b/shellscripts/cron_cache_gitbranches.php
index 837efb1da2ff49781ff722df36c738e71c1fdefe..9e2c37e8b74413e8ee48df3831193c453a37207c 100644
--- a/shellscripts/cron_cache_gitbranches.php
+++ b/shellscripts/cron_cache_gitbranches.php
@@ -10,6 +10,11 @@
 
 $sDocroot = (dirname(__dir__)) . "/public_html";
 
+$processUser = posix_getpwuid(posix_geteuid());
+if ($processUser['name']=="root"){
+    die("Do not start the script as user root\n");
+};
+
 require_once("$sDocroot/deployment/classes/logger.class.php");
 global $oCLog;
 $oCLog = new logger();