diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 78d6e8233..e5a8013ae 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -1239,7 +1239,7 @@ class processMap
             $result = $groups->getAllGroup($start, $limit, $filter);
             $c = 0;
             foreach ($result['rows'] as $results) {
-                if (!in_array($results['GRP_UID'], $aUIDS1)) {
+                if ($results["GRP_STATUS"] == "ACTIVE" && !in_array($results["GRP_UID"], $aUIDS1)) {
                     $c++;
                     $oCriteria = new Criteria('workflow');
                     $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER');
diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php
index 39675b78a..3d25fee22 100755
--- a/workflow/engine/classes/model/Groupwf.php
+++ b/workflow/engine/classes/model/Groupwf.php
@@ -347,7 +347,6 @@ class Groupwf extends BaseGroupwf
         $criteria->addSelectColumn( GroupwfPeer::GRP_STATUS );
         $criteria->addSelectColumn( GroupwfPeer::GRP_UX );
         $criteria->addAsColumn( 'GRP_TITLE', ContentPeer::CON_VALUE );
-        $criteria->addSelectColumn( ContentPeer::CON_VALUE, 'COCHALO' );
         $criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
         $criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
         $criteria->add( ContentPeer::CON_LANG, SYS_LANG );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
index c6cac2c64..71e66a64e 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
@@ -900,6 +900,7 @@ class Task
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
             $criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
             $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
+            $criteria->add(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL);
             $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
             $criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
             $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/User.php
index 63a8058bc..e1e1f061d 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/User.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/User.php
@@ -223,7 +223,7 @@ class User
                 if ($form['USR_COUNTRY'] != '') {
                     $oCountry = \IsoCountryPeer::retrieveByPK($form['USR_COUNTRY']);
                     if (is_null($oCountry)) {
-                        throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array($form['USR_COUNTRY'])));
+                        throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('usr_country')));
                     }
                 }
             }
@@ -231,7 +231,7 @@ class User
                 if ($form['USR_CITY'] != '') {
                     $oCity = \IsoSubdivisionPeer::retrieveByPK($form['USR_COUNTRY'], $form['USR_CITY']);
                     if (is_null($oCity)) {
-                        throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array($form['USR_CITY'])));
+                        throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('usr_city')));
                     }
                 }
             }
@@ -239,7 +239,7 @@ class User
                 if ($form['USR_LOCATION'] != '') {
                     $oLocation = \IsoLocationPeer::retrieveByPK($form['USR_COUNTRY'], $form['USR_LOCATION']);
                     if (is_null($oLocation)) {
-                        throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array($form['USR_LOCATION'])));
+                        throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('usr_location')));
                     }
                 }
             }