Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r29bc39cd5828fbffdc6a414fd18b91e6a89f66c4 -r1ff532f29d381dbae40ea6f179058b5bd6c01b9b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 29bc39cd5828fbffdc6a414fd18b91e6a89f66c4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 1ff532f29d381dbae40ea6f179058b5bd6c01b9b)
@@ -315,8 +315,8 @@
     }
 
     @Override
-    public boolean checkTimeLimitExceeded(long assessmentUid, long userUid) {
-	Long secondsLeft = LearningWebsocketServer.getSecondsLeft(assessmentUid, userUid);
+    public boolean checkTimeLimitExceeded(long assessmentUid, long userId) {
+	Long secondsLeft = LearningWebsocketServer.getSecondsLeft(assessmentUid, userId);
 	return secondsLeft != null && secondsLeft.equals(0);
     }
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -r998ba383ec2a06647d309f910ebefe0a33fa30a4 -r1ff532f29d381dbae40ea6f179058b5bd6c01b9b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 998ba383ec2a06647d309f910ebefe0a33fa30a4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 1ff532f29d381dbae40ea6f179058b5bd6c01b9b)
@@ -99,7 +99,7 @@
      * @param groupLeader
      * @return whether the time limit is exceeded already
      */
-    boolean checkTimeLimitExceeded(long assessmentUid, long userUid);
+    boolean checkTimeLimitExceeded(long assessmentUid, long userId);
 
     /**
      * Get users by given toolSessionID.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r29bc39cd5828fbffdc6a414fd18b91e6a89f66c4 -r1ff532f29d381dbae40ea6f179058b5bd6c01b9b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 29bc39cd5828fbffdc6a414fd18b91e6a89f66c4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 1ff532f29d381dbae40ea6f179058b5bd6c01b9b)
@@ -188,7 +188,8 @@
 		}
 
 		//if the time is up and leader hasn't submitted response - show waitForLeaderFinish page
-		boolean isTimeLimitExceeded = service.checkTimeLimitExceeded(assessment.getUid(), groupLeader.getUid());
+		boolean isTimeLimitExceeded = service.checkTimeLimitExceeded(assessment.getUid(),
+			groupLeader.getUserId());
 		if (isTimeLimitExceeded) {
 		    request.setAttribute(AssessmentConstants.PARAM_WAITING_MESSAGE_KEY,
 			    "label.waiting.for.leader.finish");
@@ -430,7 +431,8 @@
 	AssessmentUser leader = session.getGroupLeader();
 
 	//in case of time limit - prevent user from seeing questions page longer than time limit allows
-	boolean isTimeLimitExceeded = service.checkTimeLimitExceeded(session.getAssessment().getUid(), leader.getUid());
+	boolean isTimeLimitExceeded = service.checkTimeLimitExceeded(session.getAssessment().getUid(),
+		leader.getUserId());
 	boolean isLeaderResponseFinalized = service.isLastAttemptFinishedByUser(leader);
 
 	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
===================================================================
diff -u -r29bc39cd5828fbffdc6a414fd18b91e6a89f66c4 -r1ff532f29d381dbae40ea6f179058b5bd6c01b9b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 29bc39cd5828fbffdc6a414fd18b91e6a89f66c4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 1ff532f29d381dbae40ea6f179058b5bd6c01b9b)
@@ -213,19 +213,19 @@
 	}
     }
 
-    public static Long getSecondsLeft(long assessmentUid, long userUid) {
+    public static Long getSecondsLeft(long assessmentUid, long userId) {
 	TimeCache timeCache = timeCaches.get(assessmentUid);
-	return timeCache == null ? null : LearningWebsocketServer.getSecondsLeft(timeCache, userUid);
+	return timeCache == null ? null : LearningWebsocketServer.getSecondsLeft(timeCache, userId);
     }
 
-    private static Long getSecondsLeft(TimeCache timeCache, long userUid) {
+    private static Long getSecondsLeft(TimeCache timeCache, long userId) {
 	if (timeCache.relativeTimeLimit == 0 && timeCache.absoluteTimeLimit == null) {
 	    // no time limit is set at all
 	    return null;
 	}
 
 	// when user entered the activity
-	LocalDateTime launchedDate = timeCache.timeLimitLaunchedDate.get(userUid);
+	LocalDateTime launchedDate = timeCache.timeLimitLaunchedDate.get(userId);
 	// what is the time limit for him
 	LocalDateTime finish = null;
 	if (timeCache.absoluteTimeLimit != null) {