Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230208.sql
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230208.sql	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230208.sql	(revision f7ff5b86cc44db37f600384016cd0bf4f69db00e)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5360 Use core Users and not AssessmentUsers for marker column
+UPDATE tl_laasse10_question_result AS r JOIN tl_laasse10_user AS u ON r.marked_by = u.uid
+	SET r.marked_by = u.user_id;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
===================================================================
diff -u -r8bcf5f3b87aa5b9bcead80b6c2c06a5982513b41 -rf7ff5b86cc44db37f600384016cd0bf4f69db00e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 8bcf5f3b87aa5b9bcead80b6c2c06a5982513b41)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision f7ff5b86cc44db37f600384016cd0bf4f69db00e)
@@ -42,6 +42,7 @@
 import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.qb.model.QbToolAnswer;
 import org.lamsfoundation.lams.tool.assessment.dto.QuestionDTO;
+import org.lamsfoundation.lams.usermanagement.User;
 
 /**
  * Assessment Question Result
@@ -77,13 +78,13 @@
 
     @Column
     private String justification;
-    
+
     @Column(name = "marker_comment")
     private String markerComment;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "marked_by")
-    private AssessmentUser markedBy;
+    private User markedBy;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "result_uid")
@@ -210,20 +211,20 @@
 	return justification == null ? null : StringEscapeUtils.escapeJavaScript(justification.replace("\r\n", "<br>"));
     }
 
-    public AssessmentUser getMarkedBy() {
+    public User getMarkedBy() {
 	return markedBy;
     }
 
-    public void setMarkedBy(AssessmentUser markedBy) {
+    public void setMarkedBy(User markedBy) {
 	this.markedBy = markedBy;
     }
-    
+
     public String getMarkerComment() {
-        return markerComment;
+	return markerComment;
     }
 
     public void setMarkerComment(String markerComment) {
-        this.markerComment = markerComment;
+	this.markerComment = markerComment;
     }
 
     public AssessmentUser getUser() {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -re056a0a5b2e79bb29440e7b57e7ec4b89735a1cb -rf7ff5b86cc44db37f600384016cd0bf4f69db00e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision e056a0a5b2e79bb29440e7b57e7ec4b89735a1cb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision f7ff5b86cc44db37f600384016cd0bf4f69db00e)
@@ -2336,9 +2336,9 @@
 	    Assessment assessment = assessmentResult.getAssessment();
 	    Long questionUid = questionResult.getQbToolQuestion().getUid();
 
-	    AssessmentUser teacher = null;
+	    User teacher = null;
 	    if (teacherId != null) {
-		teacher = getUserByIdAndContent(teacherId.longValue(), assessment.getContentId());
+		teacher = userManagementService.getUserById(teacherId);
 	    }
 
 	    // When changing a mark for user and isUseSelectLeaderToolOuput is true, the mark should be propagated to all