diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php
index 1b56012af..df5fb3a83 100644
--- a/gulliver/system/class.rbac.php
+++ b/gulliver/system/class.rbac.php
@@ -10,7 +10,7 @@ class RBAC
     const PER_SYSTEM = '00000000000000000000000000000002';
     const PM_GUEST_CASE = 'PM_GUEST_CASE';
     const PM_GUEST_CASE_UID = '00000000000000000000000000000066';
-    const PROCESSMAKER_GUEST = 'PROCESSMAKER_GUEST';
+    const PROCESSMAKER_GUEST = 'LURANA_GUEST';
     const PROCESSMAKER_GUEST_UID = '00000000000000000000000000000005';
     const GUEST_USER_UID = '00000000000000000000000000000002';
     public static $defaultPermissionsForAdmin = ['PM_TASK_SCHEDULER_ADMIN'];
diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php
index e1912fb4b..ec96b1e70 100644
--- a/rbac/engine/classes/model/Roles.php
+++ b/rbac/engine/classes/model/Roles.php
@@ -118,8 +118,8 @@ class Roles extends BaseRoles
             $criteria->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL);
             $criteria->add(RolesPeer::ROL_CODE, RBAC::PROCESSMAKER_GUEST, Criteria::NOT_EQUAL);
             $criteria->add(SystemsPeer::SYS_CODE, $systemCode);
-            $criteria->add(RolesPeer::ROL_CREATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
-            $criteria->add(RolesPeer::ROL_UPDATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
+            #$criteria->add(RolesPeer::ROL_CREATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
+            #$criteria->add(RolesPeer::ROL_UPDATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
 
             if (!empty($filter)) {
                 $criteria->add(RolesPeer::ROL_CODE, '%' . $filter . '%', Criteria::LIKE);
@@ -195,6 +195,7 @@ class Roles extends BaseRoles
             $rows = [];
             while ($rs->next()) {
                 $row = $rs->getRow();
+
                 $o = new Roles();
                 $o->load($row['ROL_UID']);
                 $row['ROL_NAME'] = $o->getRolName();
diff --git a/workflow/engine/methods/roles/roles_Ajax.php b/workflow/engine/methods/roles/roles_Ajax.php
index 60112294d..8d4e28dbe 100644
--- a/workflow/engine/methods/roles/roles_Ajax.php
+++ b/workflow/engine/methods/roles/roles_Ajax.php
@@ -323,4 +323,3 @@ switch ($REQUEST) {
     default:
         echo 'default';
 }
-
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index b12b8f55d..e85c3c960 100755
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -111,6 +111,7 @@ try {
         case 'rolesList':
             $roles = new Roles();
             $rolesData = $roles->getAllRoles();
+
             $data = [];
             foreach ($rolesData as $rowId => $row) {
                 $data[] = ['ROL_UID' => $row['ROL_CODE'], 'ROL_CODE' => $row['ROL_NAME']];
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Role.php b/workflow/engine/src/ProcessMaker/BusinessModel/Role.php
index cf8e98539..105cbde79 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Role.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Role.php
@@ -678,7 +678,7 @@ class Role
             ->where('CONTENT.CON_CATEGORY', '=', 'ROL_NAME')
             ->where('CONTENT.CON_LANG', '=', $lang)
             ->where('RBAC_ROLES.ROL_CODE', '<>', 'RBAC_ADMIN')
-            ->where('RBAC_ROLES.ROL_CODE', '<>', 'PROCESSMAKER_GUEST')
+            ->where('RBAC_ROLES.ROL_CODE', '<>', 'LURANA_GUEST')
             ->where('RBAC_ROLES.ROL_STATUS', '=', '1')
             ->select([
                 'RBAC_ROLES.ROL_UID',
@@ -691,4 +691,3 @@ class Role
         return $roles;
     }
 }
-