Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r23bb9654e96c06d79cd639a55e7d1af82cf678a8 -r0a0ccdbc33e02ec8d764befc7f732a397914890b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23bb9654e96c06d79cd639a55e7d1af82cf678a8)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0a0ccdbc33e02ec8d764befc7f732a397914890b)
@@ -392,7 +392,7 @@
 	// get back login user DTO
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	AssessmentUser assessmentUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
-		assessmentForm.getAssessment().getContentId());
+		assessmentPO.getContentId());
 	if (assessmentUser == null) {
 	    assessmentUser = new AssessmentUser(user, assessmentPO);
 	}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r23bb9654e96c06d79cd639a55e7d1af82cf678a8 -r0a0ccdbc33e02ec8d764befc7f732a397914890b
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 23bb9654e96c06d79cd639a55e7d1af82cf678a8)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0a0ccdbc33e02ec8d764befc7f732a397914890b)
@@ -531,7 +531,7 @@
 
 	// **********************************Get Resource
 	// PO*********************
-	Resource resourcePO = service.getResourceByContentId(resourceForm.getResource().getContentId());
+	Resource resourcePO = service.getResourceByContentId(resource.getContentId());
 	if (resourcePO == null) {
 	    // new Resource, create it.
 	    resourcePO = resource;
@@ -566,7 +566,7 @@
 	// get back login user DTO
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	ResourceUser resourceUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
-		resourceForm.getResource().getContentId());
+		resourcePO.getContentId());
 	if (resourceUser == null) {
 	    resourceUser = new ResourceUser(user, resourcePO);
 	}