diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index ac0cea33c..71d903ee5 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -2832,7 +2832,7 @@ class G
      * @param string $array_i
      * @return array
      */
-    public function array_merge_2(&$array, &$array_i)
+    public static function array_merge_2(&$array, &$array_i)
     {
         foreach ($array_i as $k => $v) {
             if (is_array($v)) {
diff --git a/workflow/engine/controllers/InstallerModule.php b/workflow/engine/controllers/InstallerModule.php
index fb569e0a9..e7b447797 100644
--- a/workflow/engine/controllers/InstallerModule.php
+++ b/workflow/engine/controllers/InstallerModule.php
@@ -926,7 +926,7 @@ class InstallerModule extends Controller
                 ->update([
                     'USR_USERNAME' => $adminUsername,
                     'USR_LASTNAME' => $adminUsername,
-                    'USR_PASSWORD' => Bootstrap::hashPassword($adminPassword, Bootstrap::hashBcrypt)
+                    'USR_PASSWORD' => G::encryptHash($adminPassword)
                 ]);
 
             DB::connection(self::CONNECTION_INSTALL)
@@ -935,7 +935,7 @@ class InstallerModule extends Controller
                 ->update([
                     'USR_USERNAME' => $adminUsername,
                     'USR_LASTNAME' => $adminUsername,
-                    'USR_PASSWORD' => Bootstrap::hashPassword($adminPassword, Bootstrap::hashBcrypt)
+                    'USR_PASSWORD' => G::encryptHash($adminPassword)
                 ]);
             // Write the paths_installed.php file (contains all the information configured so far)
             if (!file_exists(FILE_PATHS_INSTALLED)) {
diff --git a/workflow/engine/methods/groups/groups_Ajax.php b/workflow/engine/methods/groups/groups_Ajax.php
index 4b227b6dd..30801d56f 100644
--- a/workflow/engine/methods/groups/groups_Ajax.php
+++ b/workflow/engine/methods/groups/groups_Ajax.php
@@ -160,7 +160,8 @@ switch ($_POST['action']) {
         $start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
         $limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
         $filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
-        $groupUid = $inputFilter->quoteSmart($_REQUEST['gUID'], Propel::getConnection("workflow")->getResource());
+        $connection = Propel::getConnection("workflow")->getResource();
+        $groupUid = $inputFilter->quoteSmart($_REQUEST['gUID'], $connection);
 
         $groupUsers = new GroupUser();
         $type = $_POST['action'] === 'assignedMembers' ? 'USERS' : 'AVAILABLE-USERS';
diff --git a/workflow/engine/src/ProcessMaker/Core/Installer.php b/workflow/engine/src/ProcessMaker/Core/Installer.php
index 896de30b4..cd7ef9806 100644
--- a/workflow/engine/src/ProcessMaker/Core/Installer.php
+++ b/workflow/engine/src/ProcessMaker/Core/Installer.php
@@ -513,7 +513,7 @@ class Installer
             ->where('USR_UID', '00000000000000000000000000000001')
             ->update([
                 'USR_USERNAME' => $this->options['admin']['username'],
-                'USR_PASSWORD' => Bootstrap::hashPassword($this->options['admin']['password'], Bootstrap::hashBcrypt)
+                'USR_PASSWORD' => G::encryptHash($this->options['admin']['password'])
             ]);
 
         DB::connection(self::CONNECTION_INSTALL)
@@ -521,7 +521,7 @@ class Installer
             ->where('USR_UID', '00000000000000000000000000000001')
             ->update([
                 'USR_USERNAME' => $this->options['admin']['username'],
-                'USR_PASSWORD' => Bootstrap::hashPassword($this->options['admin']['password'], Bootstrap::hashBcrypt)
+                'USR_PASSWORD' => G::encryptHash($this->options['admin']['password'])
             ]);
     }