diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php
index 989c0fca2..d14583f10 100644
--- a/workflow/engine/classes/model/Groupwf.php
+++ b/workflow/engine/classes/model/Groupwf.php
@@ -98,13 +98,13 @@ class Groupwf extends BaseGroupwf
                 $this->setGrpTitle('Default Group Title');
             }
 
-            if (!empty($aData['GRP_STATUS'])) {
+            if (!empty($data['GRP_STATUS'])) {
                 $this->setGrpStatus($data['GRP_STATUS']);
             } else {
                 $this->setGrpStatus('ACTIVE');
             }
 
-            if (!empty($aData['GRP_LDAP_DN'])) {
+            if (!empty($data['GRP_LDAP_DN'])) {
                 $this->setGrpLdapDn($data['GRP_LDAP_DN']);
             } else {
                 $this->setGrpLdapDn('');
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index 46b98042e..0e09d5009 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -1501,7 +1501,8 @@ class System
      */
     public static function getServerProtocol()
     {
-        return G::is_https() ? "https://" : "http://";
+        $envProtocol = defined("REQUEST_SCHEME") && REQUEST_SCHEME === "https";
+        return G::is_https() || $envProtocol ? "https://" : "http://";
     }
 
     /**