Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java
===================================================================
diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -rc7680ea1112522bd5e58439421a26cc402c82138
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java	(.../GroupUser.java)	(revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java	(.../GroupUser.java)	(revision c7680ea1112522bd5e58439421a26cc402c82138)
@@ -29,6 +29,7 @@
 import javax.persistence.Embeddable;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.MapsId;
 import javax.persistence.Table;
@@ -68,12 +69,14 @@
     @EmbeddedId
     private GroupUserPrimaryKey id;
 
+    @MapsId("id")
     @ManyToOne
-    @MapsId("groupId")
+    @JoinColumn(name = "group_id")
     private Group group;
 
+    @MapsId("id")
     @ManyToOne
-    @MapsId("userId")
+    @JoinColumn(name = "user_id")
     private User user;
 
     @Column(name = "scheduled_lesson_end_date")