diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 8b368fa3b8f020a2439104c722f707c46d95fb21..c82b7b40c47d52cf81875a89952e14a315c84081 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -314,6 +314,7 @@ function NextButtonClick(CurPageID: Integer): Boolean;
 var myResult: Integer;
 var res: Boolean;
 var paramok: Boolean;
+var datadir: String;
 var exedirold: String;
 var exedirnew: String;
 var themessage: String;
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index df755a50b64c8610ca664dd36222c037ac2f42a2..38054c48c690b697066c47170f812de652d39c6e 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -80,6 +80,23 @@ if ($key != $conf->global->CRON_KEY)
 	exit(-1);
 }
 
+// If param userlogin is reserved word 'firstadmin' 
+if ($userlogin == 'firstadmin')
+{
+    $sql='SELECT login from '.MAIN_DB_PREFIX.'user WHERE admin = 1 ORDER BY entity LIMIT 1';
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $obj=$db->fetch_object($resql);
+        if ($obj) 
+        {
+            $userlogin = $obj->login;
+            echo "First admin user found is login '".$userlogin."'\n<br>";
+        }
+    }
+    else dol_print_error($db);
+}
+
 // Check user login
 $user=new User($db);
 $result=$user->fetch('',$userlogin);
@@ -93,8 +110,8 @@ else
 {
 	if (empty($user->id))
 	{
-		echo " User user login: ".$userlogin." do not exists";
-		dol_syslog(" User user login:".$userlogin." do not exists", LOG_ERR);
+		echo "User user login: ".$userlogin." does not exists";
+		dol_syslog("User user login:".$userlogin." does not exists", LOG_ERR);
 		exit(-1);
 	}
 }
@@ -178,7 +195,7 @@ function usage($path,$script_file)
 {
 	global $conf;
 
-	print "Usage: ".$script_file." securitykey userlogin [cronjobid]\n";
+	print "Usage: ".$script_file." securitykey userlogin|'firstadmin' [cronjobid]\n";
 	print "The script return 0 when everything worked successfully.\n";
 	print "\n";
 	print "On Linux system, you can have cron jobs ran automatically by adding an entry into cron.\n";