diff --git a/deadlock-plugins/deadlock-extension/src/core/mission/model/userMission.ts b/deadlock-plugins/deadlock-extension/src/core/mission/model/userMission.ts
index 7917a776dbddf2cf20eaccb11a1f01bd281fe5dc..ea53d0aa6b4de688fd308619c3af13a5e54796ff 100644
--- a/deadlock-plugins/deadlock-extension/src/core/mission/model/userMission.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/mission/model/userMission.ts
@@ -32,5 +32,8 @@ export interface User {
 }
 
 export function isReviewingStudent(userMission: UserMission) {
-  return userMission.currentUserId !== userMission.remoteUserDetails.id;
+  return (
+    userMission.remoteGitUsername !== userMission.username &&
+    (userMission.currentUserDetails.roles.has('PROFESSOR') || userMission.currentUserDetails.roles.has('ADMIN'))
+  );
 }