diff --git a/src/main/java/org/olat/course/run/CourseRuntimeController.java b/src/main/java/org/olat/course/run/CourseRuntimeController.java
index 3e149c758b58c9a252ea5f45906abe674d9052cd..129c7f19c7a383ebc32f04eb92ffc3033d805e34 100644
--- a/src/main/java/org/olat/course/run/CourseRuntimeController.java
+++ b/src/main/java/org/olat/course/run/CourseRuntimeController.java
@@ -481,9 +481,15 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
 	
 	private void setCourseClosedMessage() {
 		UserCourseEnvironment userCourseEnv = getUserCourseEnvironment();
-		if(userCourseEnv != null &&  getRepositoryEntry().getEntryStatus() == RepositoryEntryStatusEnum.closed) {
-			toolbarPanel.setMessage(translate("course.closed"));
-			toolbarPanel.setMessageCssClass("o_warning");
+		if(userCourseEnv != null) {
+			if(getRepositoryEntry().getEntryStatus() == RepositoryEntryStatusEnum.closed) {
+				toolbarPanel.setMessage(translate("course.closed"));
+				toolbarPanel.setMessageCssClass("o_warning");
+			} else if(getRepositoryEntry().getEntryStatus() == RepositoryEntryStatusEnum.deleted
+					|| getRepositoryEntry().getEntryStatus() == RepositoryEntryStatusEnum.trash) {
+				toolbarPanel.setMessage(translate("course.deleted"));
+				toolbarPanel.setMessageCssClass("o_warning");
+			}
 		} else {
 			toolbarPanel.setMessage(null);
 			toolbarPanel.setMessageComponent(null);
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties
index fd13bbb9485ab7009da7ba65786b88ed774b6352..3be482b63fee7927b84e9a2b8dafa055be57f09c 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties
@@ -55,6 +55,7 @@ command.run=Kurs Laufzeitumgebung
 command.settings=Kursinfo \u00e4ndern
 command.wiki=Wiki
 course.closed=Dieser Kurs wurde beendet und kann nicht mehr bearbeitet oder aktualisiert werden.
+course.deleted=Dieser Kurs wurde gel\u00f6scht und kann nicht mehr bearbeitet oder aktualisiert werden.
 course.disposed.command.restart=Den Kurs beenden und neu starten
 course.disposed.message=Bitte beenden Sie diesen Kurs und starten Sie ihn neu.
 course.disposed.title=Dieser Kurs wurde ver\u00e4ndert.
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties
index 0defb69156aab597a9f7b758ad3acb14343a811d..5d0f8ecd4f7fce6e3b5d1fbf3b03014792ff5cf7 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties
@@ -55,6 +55,7 @@ command.run=Course runtime
 command.settings=Change course info
 command.wiki=Wiki
 course.closed=This course is finished and can therefore no longer be edited or updated.
+course.deleted=This course is deleted and can therefore no longer be edited or updated.
 course.disposed.command.restart=Close course and restart
 course.disposed.message=Please close this course and restart.
 course.disposed.title=This course has been modified.
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties
index d954f235e95ea3d0724b87eee1cb76c9783ded9d..7dd82aaddc4a0e8445fa237a3b61cab6fcf5c3be 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties
@@ -55,6 +55,7 @@ command.run=Cours
 command.settings=Modifier la description
 command.wiki=Wiki
 course.closed=Ce cours est termin\u00E9 et n'est plus \u00E9dit\u00E9 ou actualis\u00E9.
+course.deleted=Ce cours a \u00E9t\u00E9 effac\u00E9 et n'est plus \u00E9dit\u00E9 ou actualis\u00E9.
 course.disposed.command.restart=Fermer le cours et red\u00E9marrer.
 course.disposed.message=Fermez le cours et red\u00E9marrez-le \u00E0 nouveau SVP.
 course.disposed.title=Le cours a \u00E9t\u00E9 modifi\u00E9.
diff --git a/src/main/java/org/olat/course/run/userview/UserCourseEnvironmentImpl.java b/src/main/java/org/olat/course/run/userview/UserCourseEnvironmentImpl.java
index bf905bc81e75759d343cae970f0d29e9cc76302b..9e5885a5413b19c1452dc237cf42a8abf2422ac9 100644
--- a/src/main/java/org/olat/course/run/userview/UserCourseEnvironmentImpl.java
+++ b/src/main/java/org/olat/course/run/userview/UserCourseEnvironmentImpl.java
@@ -50,7 +50,6 @@ import org.olat.group.BusinessGroup;
 import org.olat.modules.curriculum.CurriculumElement;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntrySecurity;
-import org.olat.repository.RepositoryEntryStatusEnum;
 import org.olat.repository.model.RepositoryEntryLifecycle;
 
 /**
@@ -81,7 +80,7 @@ public class UserCourseEnvironmentImpl implements UserCourseEnvironment {
 	public UserCourseEnvironmentImpl(IdentityEnvironment identityEnvironment, CourseEnvironment courseEnvironment) {
 		this(identityEnvironment, courseEnvironment, null, null, null, null, null, null, null, null);
 		if(courseEnvironment != null) {
-			courseReadOnly = courseEnvironment.getCourseGroupManager().getCourseEntry().getEntryStatus() == RepositoryEntryStatusEnum.closed;
+			courseReadOnly = courseEnvironment.getCourseGroupManager().getCourseEntry().getEntryStatus().decommissioned();
 		}
 	}
 
diff --git a/src/main/java/org/olat/repository/RepositoryManager.java b/src/main/java/org/olat/repository/RepositoryManager.java
index 418e44adc99cb23f0cd895780e15312da3a3a25b..21b86c268453db403306d9c6ff36db1a3ef5cc9c 100644
--- a/src/main/java/org/olat/repository/RepositoryManager.java
+++ b/src/main/java/org/olat/repository/RepositoryManager.java
@@ -640,7 +640,7 @@ public class RepositoryManager {
 			}
 		}
 
-		boolean readOnly = re.getEntryStatus() == RepositoryEntryStatusEnum.closed;
+		boolean readOnly = re.getEntryStatus().decommissioned();
 
 		return new RepositoryEntrySecurityImpl(isEntryAdmin, isOwner,
 				isCourseParticipant, isCourseCoach,
diff --git a/src/main/java/org/olat/repository/model/SingleRoleRepositoryEntrySecurity.java b/src/main/java/org/olat/repository/model/SingleRoleRepositoryEntrySecurity.java
index 991fce053e27db6faeb165964483fa889c09bae4..3b78d27beba190d9c347f13fc9bdbc0728d60d78 100644
--- a/src/main/java/org/olat/repository/model/SingleRoleRepositoryEntrySecurity.java
+++ b/src/main/java/org/olat/repository/model/SingleRoleRepositoryEntrySecurity.java
@@ -58,7 +58,7 @@ public class SingleRoleRepositoryEntrySecurity implements RepositoryEntrySecurit
 			return iconCssClass;
 		}
 		
-	};
+	}
 	
 	private Role currentRole;
 	private RepositoryEntrySecurity wrappedSecurity;