diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/GroupController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/GroupController.java
index f29dfed771ebd26ca850c3b264ebaa465529ab35..d14375f55319f38065b48773fbc6ebb284fb508d 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/GroupController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/GroupController.java
@@ -96,6 +96,7 @@ public class GroupController {
 
         Group group = new Group();
         group.setGroupName(groupRequest.groupName());
+
         Group createdGroup = groupService.createGroup(group);
 
         User user = optionalUser.get();
@@ -105,6 +106,12 @@ public class GroupController {
                 .groupId(createdGroup.getGroupId())
                 .build();
 
+        Optional<UserGroupAsso> oldPrimaryOptional = groupService.findPrimaryUserGroupAssoForUser(user.getUsername());
+        if(oldPrimaryOptional.isPresent()){
+            oldPrimaryOptional.get().setPrimaryGroup(false);
+            groupService.updateUserGroupAsso(oldPrimaryOptional.get());
+        }
+
         createdGroup.addUser(UserGroupAsso.builder()
                 .id(userGroupId)
                 .primaryGroup(true)