diff --git a/src/Frontend/src/composables/serviceServiceControl.ts b/src/Frontend/src/composables/serviceServiceControl.ts
index c3716a0c1..edbc58f14 100644
--- a/src/Frontend/src/composables/serviceServiceControl.ts
+++ b/src/Frontend/src/composables/serviceServiceControl.ts
@@ -41,9 +41,9 @@ export const monitoringConnectionState = reactive<ConnectionState>({
 export const environment = reactive({
   monitoring_version: "",
   sc_version: "",
-  minimum_supported_sc_version: "4.33.4",
+  minimum_supported_sc_version: "6.6.0",
   is_compatible_with_sc: true,
-  sp_version: window.defaultConfig && window.defaultConfig.version ? window.defaultConfig.version : "1.1.0",
+  sp_version: window.defaultConfig && window.defaultConfig.version ? window.defaultConfig.version : "1.2.0",
   supportsArchiveGroups: false,
   endpoints_error_url: "",
   known_endpoints_url: "",
diff --git a/src/Frontend/src/views/AuditView.vue b/src/Frontend/src/views/AuditView.vue
index ca8dff7d1..4249e1b9d 100644
--- a/src/Frontend/src/views/AuditView.vue
+++ b/src/Frontend/src/views/AuditView.vue
@@ -1,38 +1,40 @@
 <script setup lang="ts">
-import { licenseStatus } from "../composables/serviceLicense";
-import LicenseExpired from "../components/LicenseExpired.vue";
 import AuditList from "@/components/audit/AuditList.vue";
 import isAllMessagesSupported, { minimumSCVersionForAllMessages } from "@/components/audit/isAllMessagesSupported.ts";
 import ConditionalRender from "@/components/ConditionalRender.vue";
+import ServiceControlAvailable from "@/components/ServiceControlAvailable.vue";
+import LicenseNotExpired from "@/components/LicenseNotExpired.vue";
 </script>
 
 <template>
-  <ConditionalRender :supported="isAllMessagesSupported">
-    <template #unsupported>
-      <div class="not-supported">
-        <p>
-          The minimum version of ServiceControl required to enable this feature is
-          <span> {{ minimumSCVersionForAllMessages }} </span>.
-        </p>
-        <div>
-          <a class="btn btn-default btn-primary" href="https://particular.net/downloads" target="_blank">Update ServiceControl to latest version</a>
-        </div>
-      </div>
-    </template>
-    <LicenseExpired />
-    <template v-if="!licenseStatus.isExpired">
-      <div class="container">
-        <div class="row title">
-          <div class="col-12">
-            <h1>All Messages</h1>
+  <ServiceControlAvailable>
+    <LicenseNotExpired>
+      <ConditionalRender :supported="isAllMessagesSupported">
+        <template #unsupported>
+          <div class="not-supported">
+            <p>
+              The minimum version of ServiceControl required to enable this feature is
+              <span> {{ minimumSCVersionForAllMessages }} </span>.
+            </p>
+            <div>
+              <a class="btn btn-default btn-primary" href="https://particular.net/downloads" target="_blank">Update ServiceControl to latest version</a>
+            </div>
+          </div>
+        </template>
+
+        <div class="container">
+          <div class="row title">
+            <div class="col-12">
+              <h1>All Messages</h1>
+            </div>
+          </div>
+          <div class="row">
+            <AuditList />
           </div>
         </div>
-        <div class="row">
-          <AuditList />
-        </div>
-      </div>
-    </template>
-  </ConditionalRender>
+      </ConditionalRender>
+    </LicenseNotExpired>
+  </ServiceControlAvailable>
 </template>
 
 <style scoped>