diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringServiceImpl.java
index daab9ebd..9e41e1bc 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringServiceImpl.java
@@ -276,7 +276,6 @@ public class ScreenProctoringServiceImpl implements ScreenProctoringService {
     @Override
     @Async(AsyncServiceSpringConfig.EXECUTOR_BEAN_NAME)
     public void deleteSPSUser(final String userUUID) {
-
         if (!webserviceInfo.getScreenProctoringServiceBundle().bundled) {
             return;
         }
@@ -287,8 +286,7 @@ public class ScreenProctoringServiceImpl implements ScreenProctoringService {
     @Override
     public void notifyExamStarted(final ExamStartedEvent event) {
         final Exam exam = event.exam;
-        if (!this.isScreenProctoringEnabled(exam.id) ||
-                BooleanUtils.toBoolean(exam.additionalAttributes.get(SPSData.ATTR_SPS_ACTIVE))) {
+        if (!this.isScreenProctoringEnabled(event.exam.id)) {
             return;
         }
 
@@ -297,9 +295,7 @@ public class ScreenProctoringServiceImpl implements ScreenProctoringService {
 
     @Override
     public void notifyExamFinished(final ExamFinishedEvent event) {
-
-        if (!this.isScreenProctoringEnabled(event.exam.id) ||
-                !BooleanUtils.toBoolean(event.exam.additionalAttributes.get(SPSData.ATTR_SPS_ACTIVE))) {
+        if (!this.isScreenProctoringEnabled(event.exam.id)) {
             return;
         }
 
@@ -310,8 +306,7 @@ public class ScreenProctoringServiceImpl implements ScreenProctoringService {
 
     @Override
     public void notifyExamReset(final ExamResetEvent event) {
-        if (!this.isScreenProctoringEnabled(event.exam.id) ||
-                BooleanUtils.toBoolean(event.exam.additionalAttributes.get(SPSData.ATTR_SPS_ACTIVE))) {
+        if (!this.isScreenProctoringEnabled(event.exam.id)) {
             return;
         }
 
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 8566d766..de699f68 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -905,13 +905,13 @@ sebserver.exam.proctoring.one.close.error=Failed to close the one-to-one room pr
 sebserver.exam.proctoring.collecting.open.error=Failed to open the collecting room.
 sebserver.exam.proctoring.collecting.close.error=Failed to close the collecting room properly.
 
-sebserver.examtemplate.sps.actions.open=Screen Recording Settings
-sebserver.examtemplate.sps.form.title=Screen Recording Settings
-sebserver.exam.sps.actions.open=Screen Recording Settings
-sebserver.exam.sps.form.title=Screen Recording Settings
+sebserver.examtemplate.sps.actions.open=Screen Proctoring Settings
+sebserver.examtemplate.sps.form.title=Screen Proctoring Settings
+sebserver.exam.sps.actions.open=Screen Proctoring Settings
+sebserver.exam.sps.form.title=Screen Proctoring Settings
 sebserver.exam.sps.form.info.title=Info
 sebserver.exam.sps.form.info=This allows to integrate a SEB screen proctoring service for this exam to record screens and interaction-data for all SEBs applying the exam.<br/>The SEB screen proctoring service must be available within the given URL and accessible as administrator with the given account credentials.<br/>Also the service API credentials are needed to connect to the service securely.
-sebserver.exam.sps.form.enable=Enable Screen Recording
+sebserver.exam.sps.form.enable=Enable Screen Proctoring
 sebserver.exam.sps.form.enable.tooltip=To enable screen recording with SEB and SEB Server you need to integrate an available SEB screen proctoring service
 sebserver.exam.sps.form.url=Service URL
 sebserver.exam.sps.form.url.tooltip=The root URL of the SEB screen proctoring service for integration
@@ -2143,7 +2143,7 @@ sebserver.examtemplate.form.description.tooltip=The description of the exam temp
 sebserver.examtemplate.form.default=Institutional Default
 sebserver.examtemplate.form.default.tooltip=Set this to mark this as the default exam template for the institution.<br/>Only one exam template at the time can be marked as default. Please be aware that an existing default exam template will be reset if this is set as default.
 sebserver.examtemplate.form.lms.integration=Assessment Tool Integration
-sebserver.examtemplate.form.lms.integration.tooltip=If active, this template is exposed to all Assessment Tool Setups with full SEB Server integration to use it for remote Exam creation calls.
+sebserver.examtemplate.form.lms.integration.tooltip=If active, this template can be selected in the assessment tool to create an exam on SEB Server via the assessment tool. The assessment tool needs a full SEB Server integration.
 sebserver.examtemplate.form.examType=Exam Type
 sebserver.examtemplate.form.examType.tooltip=The exam type group identifier for if the exam template
 sebserver.examtemplate.form.examConfigTemplate=Configuration Template