diff --git a/src/unipoll_api/routes/group.py b/src/unipoll_api/routes/group.py
index 56212c9..11417b3 100644
--- a/src/unipoll_api/routes/group.py
+++ b/src/unipoll_api/routes/group.py
@@ -184,6 +184,11 @@ async def set_group_policy(group: Group = Depends(Dependencies.get_group),
             policy_list = await PolicyActions.get_policies(resource=group, policy_holder=group)  # type: ignore
             policy = policy_list.policies[0]  # type: ignore
             policy = await Policy.get(policy.id, fetch_links=True)  # type: ignore
+        else:
+            account = AccountManager.active_user.get()
+            policy_list = await PolicyActions.get_policies(resource=group, policy_holder=account)
+            policy = policy_list.policies[0]
+            policy = await Policy.get(policy.id, fetch_links=True)
 
         if not policy:
             raise APIException(404, "Policy not found 404")
diff --git a/src/unipoll_api/routes/workspace.py b/src/unipoll_api/routes/workspace.py
index 812dba3..2d5ef20 100644
--- a/src/unipoll_api/routes/workspace.py
+++ b/src/unipoll_api/routes/workspace.py
@@ -275,6 +275,11 @@ async def set_workspace_policy(workspace: Workspace = Depends(Dependencies.get_w
             policy_list = await actions.PolicyActions.get_policies(resource=workspace, policy_holder=group)
             policy = policy_list.policies[0]  # type: ignore
             policy = await Policy.get(policy.id, fetch_links=True)  # type: ignore
+        else:
+            account = AccountManager.active_user.get()
+            policy_list = await actions.PolicyActions.get_policies(resource=workspace, policy_holder=account)
+            policy = policy_list.policies[0]  # type: ignore
+            policy = await Policy.get(policy.id, fetch_links=True)  # type: ignore
 
         if not policy:
             raise APIException(404, "Policy not found 404")