Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
===================================================================
diff -u -r741b4aeae881d6df027beb62bb672402eb45afd3 -rec99589c994c4b1d8fad60617cc08d06b7fad3f4
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java	(.../GradeBookAction.java)	(revision 741b4aeae881d6df027beb62bb672402eb45afd3)
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java	(.../GradeBookAction.java)	(revision ec99589c994c4b1d8fad60617cc08d06b7fad3f4)
@@ -131,7 +131,7 @@
 	    // Get the user gradebook list from the db
 	    // A slightly different list is needed for userview or activity view
 	    if (view.equals("userView")) {
-		Integer userID = WebUtil.readIntParam(request, GradeBookConstants.PARAM_LOGIN);
+		Integer userID = WebUtil.readIntParam(request, "userID");
 		User learner = (User) userService.findById(User.class, userID);
 		if (learner != null) {
 		    gradeBookActivityDTOs = gradeBookService.getGBActivityRowsForLearner(lesson, learner);
Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java
===================================================================
diff -u -r662af4c9490c6c67127cda6c29d7d806a9e9eaca -rec99589c994c4b1d8fad60617cc08d06b7fad3f4
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java	(.../GradeBookMonitoringAction.java)	(revision 662af4c9490c6c67127cda6c29d7d806a9e9eaca)
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java	(.../GradeBookMonitoringAction.java)	(revision ec99589c994c4b1d8fad60617cc08d06b7fad3f4)
@@ -173,13 +173,13 @@
 	    HttpServletRequest request, HttpServletResponse response) throws Exception {
 	initServices();
 	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-	String login = WebUtil.readStrParam(request, "id");
+	Integer userID = WebUtil.readIntParam(request, "id");
 	String markStr = WebUtil.readStrParam(request, "mark", true);
 	String feedback =  WebUtil.readStrParam(request, "feedback", true);
 	Lesson lesson = lessonService.getLesson(lessonID);
-	User learner = userService.getUserByLogin(login);
+	User learner = (User)userService.findById(User.class, userID);
 
-	if (lesson != null && learner != null) {
+	if (lesson != null || learner != null) {
 	    
 	    if (markStr != null && !markStr.equals("")) {
 		Double mark = Double.parseDouble(markStr);
@@ -215,22 +215,22 @@
 	String method = WebUtil.readStrParam(request, "method");
 
 	Long activityID = null;
-	String login = null;
+	Integer userID = null;
 	
 	// Fetch the id based on which grid it came from
 	if (method.equals("activityView")) {
 	    activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
-	    login = WebUtil.readStrParam(request, "id");
+	    userID = WebUtil.readIntParam(request, "id");
 	} else if (method.equals("userView")) {
 	    activityID = WebUtil.readLongParam(request, "id");
-	    login = WebUtil.readStrParam(request, GradeBookConstants.PARAM_LOGIN);
+	    userID = WebUtil.readIntParam(request, "userID");
 	}
 
 	String markStr = WebUtil.readStrParam(request, "mark", true);
 	String feedback =  WebUtil.readStrParam(request, "feedback", true);
 
 	Activity activity = monitoringService.getActivityById(activityID);
-	User learner = userService.getUserByLogin(login);
+	User learner = (User)userService.findById(User.class, userID);
 	Lesson lesson = lessonService.getLesson(lessonID);
 
 	if (lesson != null && activity != null && learner != null && activity.isToolActivity()) {
Index: lams_central/web/gradebook/gradeBookMonitor.jsp
===================================================================
diff -u -r771e53ce121281172ff7101bd9f4eac1b02d674c -rec99589c994c4b1d8fad60617cc08d06b7fad3f4
--- lams_central/web/gradebook/gradeBookMonitor.jsp	(.../gradeBookMonitor.jsp)	(revision 771e53ce121281172ff7101bd9f4eac1b02d674c)
+++ lams_central/web/gradebook/gradeBookMonitor.jsp	(.../gradeBookMonitor.jsp)	(revision ec99589c994c4b1d8fad60617cc08d06b7fad3f4)
@@ -56,7 +56,7 @@
 					 jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll'></table><div id='"+subgrid_table_id+"_pager' class='scroll' ></div>");
 					   	jQuery("#"+subgrid_table_id).jqGrid({
 						     datatype: "xml",
-						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&method=userView&login=" + userID,
+						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&method=userView&userID=" + userID,
 						     height: "100%",
 						     width: 920,
 						     cellEdit:true,
@@ -65,7 +65,7 @@
 						     pager: subgrid_table_id + "_pager",
 							 rowList:[5,10,20,30],
 							 rowNum:10,
-						     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&method=userView&login=" + userID,
+						     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&method=userView&userID=" + userID,
 						     colNames: ['Id','Activity','Progress','Outputs', 'Competences', 'Time Taken', 'Activity FeedBack', 'Mark'],
 						     colModel: [
 						       	{name:'id', width:10, index:'id', sortable:false, hidden:true, hidedlg:true},