diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 7b9555121..5e301a195 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -229,7 +229,7 @@ public class DataManagementPlanManager {
 
     public eu.eudat.models.data.dmp.DataManagementPlan getSingle(String id, Principal principal, DynamicProjectConfiguration dynamicProjectConfiguration) throws InstantiationException, IllegalAccessException {
         DMP dataManagementPlanEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
-        if (dataManagementPlanEntity.getCreator().getId() != principal.getId() && dataManagementPlanEntity.getUsers().stream().filter(userInfo -> userInfo.getId() == principal.getId()).collect(Collectors.toList()).size() == 0)
+        if (dataManagementPlanEntity.getCreator().getId() != principal.getId() && dataManagementPlanEntity.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0)
             throw new UnauthorisedException();
         eu.eudat.models.data.dmp.DataManagementPlan datamanagementPlan = new eu.eudat.models.data.dmp.DataManagementPlan();
         datamanagementPlan.fromDataModel(dataManagementPlanEntity);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
index 18e1acbe8..eea0d1c41 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java
@@ -58,7 +58,10 @@ public class InvitationsManager {
         UserInfo invitedUser = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
         UserDMP userDMP = new UserDMP();
         userDMP.setUser(invitedUser);
+        userDMP.setDmp(invitation.getDmp());
+        userDMP.setRole(UserDMP.UserDMPRoles.USER.getValue());
         DMP datamanagementPlan = invitation.getDmp();
+        apiContext.getOperationsContext().getDatabaseRepository().getUserDmpDao().createOrUpdate(userDMP);
         apiContext.getUtilitiesService().getInvitationService().assignToDmp(apiContext.getOperationsContext().getDatabaseRepository().getDmpDao(), userDMP, datamanagementPlan);
         invitation.setAcceptedInvitation(true);
         apiContext.getOperationsContext().getDatabaseRepository().getInvitationDao().createOrUpdate(invitation);