diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ProctoringSettingsPopup.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ProctoringSettingsPopup.java
index c65449b1..38e9a8f1 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ProctoringSettingsPopup.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ProctoringSettingsPopup.java
@@ -111,6 +111,13 @@ public class ProctoringSettingsPopup {
     private final static LocTextKey RESET_SUCCESS_KEY =
             new LocTextKey("sebserver.exam.proctoring.form.resetOk");
 
+    private final static LocTextKey DEPRECATION_MESSAGE =
+            new LocTextKey("sebserver.exam.proctoring.deprecation.message");
+    private final static LocTextKey DEPRECATION_NOTE =
+            new LocTextKey("sebserver.exam.proctoring.deprecation.title");
+
+
+
     Function<PageAction, PageAction> settingsFunction(final PageService pageService, final boolean modifyGrant) {
 
         return action -> {
@@ -125,7 +132,7 @@ public class ProctoringSettingsPopup {
                             action.pageContext().getParent().getShell(),
                             pageService.getWidgetFactory())
                                     .setDialogWidth(860)
-                                    .setDialogHeight(600);
+                                    .setDialogHeight(650);
 
             final ResetButtonHandler resetButtonHandler = new ResetButtonHandler();
             if (modifyGrant) {
@@ -326,6 +333,10 @@ public class ProctoringSettingsPopup {
             final RestService restService = this.pageService.getRestService();
             final EntityKey entityKey = this.pageContext.getEntityKey();
 
+            final Composite warningPanel = this.pageService.getWidgetFactory().createWarningPanel(parent);
+            this.pageService.getWidgetFactory().labelLocalized(warningPanel, WidgetFactory.CustomVariant.TITLE_LABEL, DEPRECATION_NOTE);
+            this.pageService.getWidgetFactory().labelLocalized(warningPanel, WidgetFactory.CustomVariant.SUBTITLE, DEPRECATION_MESSAGE, null);
+
             final Composite content = this.pageService
                     .getWidgetFactory()
                     .createPopupScrollComposite(parent);
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index af355f71..434fdaee 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -830,6 +830,8 @@ sebserver.exam.proctoring.form.collect.strategy=Collecting Room Strategy
 sebserver.exam.proctoring.form.collect.strategy.tooltip=This specifies the strategy how connecting SEB clients are collected into proctoring rooms
 sebserver.exam.proctoring.form.collectingRoomSize=Collecting Room Size
 sebserver.exam.proctoring.form.collectingRoomSize.tooltip=The size of proctor rooms to collect connecting SEB clients into.
+sebserver.exam.proctoring.deprecation.title=Deprecation Note:
+sebserver.exam.proctoring.deprecation.message=The SEB Server live proctoring integration with Zoom and Jitsi Meet has been deprecated since this version of SEB Server.<br/>This means live proctoring is still available for dedicated SEB versions, but not actively maintained and supported any more.  
 
 sebserver.exam.proctoring.form.appkey.jitsi=App Key 
 sebserver.exam.proctoring.form.appkey.jitsi.tooltip=The application key of the proctoring service server