diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php
index f7ecbdf96fb7f0d81f64a749871bcbf33cb2055b..482e7815e419950ab080fdfddc9b948c5c9c068e 100755
--- a/src/app/action/controllers/PreProcessActionController.php
+++ b/src/app/action/controllers/PreProcessActionController.php
@@ -124,7 +124,7 @@ class PreProcessActionController
                     }
                 }
             } elseif ($mode == 'ENTITY') {
-                $primaryEntity = UserModel::getPrimaryEntityById(['id' => $GLOBALS['id'], 'select' => ['entities.entity_label']]);
+                $primaryEntity = UserModel::getPrimaryEntityById(['id' => $GLOBALS['id'], 'select' => ['entities.entity_id']]);
 
                 $allEntities = EntityModel::get(['select' => ['id', 'entity_id', 'entity_label', 'parent_entity_id'], 'where' => ['enabled = ?'], 'data' => ['Y'], 'orderBy' => ['parent_entity_id']]);
                 foreach ($allEntities as $key => $value) {
diff --git a/src/frontend/app/actions/redirect-action/redirect-action.component.ts b/src/frontend/app/actions/redirect-action/redirect-action.component.ts
index 1a8264b569cf080872f0df6d6a550975a9593585..d428acff96867340d66e564ea2d3b930236b0f6a 100644
--- a/src/frontend/app/actions/redirect-action/redirect-action.component.ts
+++ b/src/frontend/app/actions/redirect-action/redirect-action.component.ts
@@ -123,6 +123,7 @@ export class RedirectActionComponent implements OnInit {
                 ).subscribe();
             } else {
                 this.currentEntity = this.entities.filter((entity: any) => entity.state.selected)[0];
+                resolve(true);
             }
         });
     }