diff --git a/thirdparty/pear/Console/Getopt.php b/thirdparty/pear/Console/Getopt.php
index 5108429cc..8509b3794 100644
--- a/thirdparty/pear/Console/Getopt.php
+++ b/thirdparty/pear/Console/Getopt.php
@@ -141,7 +141,7 @@ class Console_Getopt {
      * @access private
      *
      */
-    function _parseShortOption($arg, $short_options, &$opts, &$args)
+    public static function _parseShortOption($arg, $short_options, &$opts, &$args)
     {
         for ($i = 0; $i < strlen($arg); $i++) {
             $opt = $arg{$i};
diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index c74663a92..cfc477ce4 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -2085,8 +2085,14 @@ class WorkspaceTools
                     CLI::logging("+> Restoring database {$db->name} to $dbName\n");
                     $versionBackupEngine = (isset($metadata->backupEngineVersion)) ? $metadata->backupEngineVersion : 1;
                     $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql", $aParameters, $versionBackupEngine, $connection);
-                    $workspace->createDBUser($dbUser, ($workspace->dbGrantUserPassword != '' ? $workspace->dbGrantUserPassword : $db->pass), "localhost", $dbName, $connection);
-                    $workspace->createDBUser($dbUser, ($workspace->dbGrantUserPassword != '' ? $workspace->dbGrantUserPassword : $db->pass), "%", $dbName, $connection);
+                    // Define the password
+                    if (empty($workspace->dbGrantUserPassword)) {
+                        $bdPassword = $db->pass;
+                    } else {
+                        $bdPassword = $workspace->dbGrantUserPassword;
+                    }
+                    $workspace->createDBUser($dbUser, $bdPassword, "localhost", $dbName, $connection);
+                    $workspace->createDBUser($dbUser, $bdPassword, "%", $dbName, $connection);
                 }
             }