diff --git a/docs/internal-signaling.md b/docs/internal-signaling.md
index ab490d77335..cd9d6dbf83e 100644
--- a/docs/internal-signaling.md
+++ b/docs/internal-signaling.md
@@ -53,4 +53,4 @@ Todo
 
 ### External signaling API
 
-See [External signaling API](https://nextcloud-spreed-signaling.readthedocs.io/en/latest/) for the Signaling API of the High-Performance Backend.
+See [External signaling API](https://nextcloud-spreed-signaling.readthedocs.io/en/latest/) for the Signaling API of the High-performance backend.
diff --git a/lib/SetupCheck/Configuration.php b/lib/SetupCheck/Configuration.php
index d788da0a079..620e92ecd02 100644
--- a/lib/SetupCheck/Configuration.php
+++ b/lib/SetupCheck/Configuration.php
@@ -30,7 +30,7 @@ public function getCategory(): string {
 	}
 
 	public function getName(): string {
-		return $this->l10n->t('Talk configuration');
+		return $this->l10n->t('Talk configuration values');
 	}
 
 	public function run(): SetupResult {
diff --git a/lib/SetupCheck/HighPerformanceBackend.php b/lib/SetupCheck/HighPerformanceBackend.php
index e39a75642fd..030b0d6f257 100644
--- a/lib/SetupCheck/HighPerformanceBackend.php
+++ b/lib/SetupCheck/HighPerformanceBackend.php
@@ -34,7 +34,10 @@ public function getName(): string {
 
 	public function run(): SetupResult {
 		if ($this->talkConfig->getSignalingMode() === Config::SIGNALING_INTERNAL) {
-			return SetupResult::success();
+			return SetupResult::error(
+				$this->l->t('No High-performance backend configured - Running Nextcloud Talk without the High-performance backend only scales for very small calls (max. 2-3 participants). Please set up the High-performance backend to ensure calls with multiple participants work seamlessly.'),
+				'https://portal.nextcloud.com/article/Nextcloud-Talk/High-Performance-Backend/Installation-of-Nextcloud-Talk-High-Performance-Backend',
+			);
 		}
 
 		if ($this->talkConfig->getSignalingMode() === Config::SIGNALING_CLUSTER_CONVERSATION) {
diff --git a/lib/SetupCheck/RecordingBackend.php b/lib/SetupCheck/RecordingBackend.php
index 1ae04c31d5b..3a4262cfa1a 100644
--- a/lib/SetupCheck/RecordingBackend.php
+++ b/lib/SetupCheck/RecordingBackend.php
@@ -33,7 +33,7 @@ public function run(): SetupResult {
 			return SetupResult::success();
 		}
 		if (empty($this->talkConfig->getRecordingServers())) {
-			return SetupResult::success();
+			return SetupResult::info($this->l->t('No recording backend configured'));
 		}
 		return SetupResult::error($this->l->t('Using the recording backend requires a High-performance backend.'));
 	}
diff --git a/lib/SetupCheck/SIPConfiguration.php b/lib/SetupCheck/SIPConfiguration.php
index a8eba865a4d..a3dbe3f2cac 100644
--- a/lib/SetupCheck/SIPConfiguration.php
+++ b/lib/SetupCheck/SIPConfiguration.php
@@ -33,7 +33,7 @@ public function run(): SetupResult {
 			return SetupResult::success();
 		}
 		if ($this->talkConfig->getSIPSharedSecret() === '' && $this->talkConfig->getDialInInfo() === '') {
-			return SetupResult::success();
+			return SetupResult::info($this->l->t('No SIP backend configured'));
 		}
 		return SetupResult::error($this->l->t('Using the SIP functionality requires a High-performance backend.'));
 	}
diff --git a/lib/TInitialState.php b/lib/TInitialState.php
index 8b6b5c5d0ee..4d519677ffa 100644
--- a/lib/TInitialState.php
+++ b/lib/TInitialState.php
@@ -45,7 +45,7 @@ protected function publishInitialStateShared(): void {
 		if ($signalingMode === Config::SIGNALING_CLUSTER_CONVERSATION
 			&& !$this->memcacheFactory->isAvailable()) {
 			throw new HintException(
-				'High Performance Back-end clustering is only supported with a distributed cache!'
+				'High-performance backend clustering is only supported with a distributed cache!'
 			);
 		}
 
diff --git a/src/components/AdminSettings/Federation.vue b/src/components/AdminSettings/Federation.vue
index 2221b3131f2..6244ad70232 100644
--- a/src/components/AdminSettings/Federation.vue
+++ b/src/components/AdminSettings/Federation.vue
@@ -10,6 +10,10 @@
 			<small>{{ t('spreed', 'Beta') }}</small>
 		</h2>
 
+		<p class="settings-hint additional-top-margin">
+			{{ t('spreed', 'Federated chats and calls work already. Attachment handling is coming in a future version.') }}
+		</p>
+
 		<NcCheckboxRadioSwitch :model-value="isFederationEnabled"
 			:disabled="loading"
 			type="switch"
diff --git a/src/components/AdminSettings/HostedSignalingServer.vue b/src/components/AdminSettings/HostedSignalingServer.vue
index 80c9d564097..0b223bb257f 100644
--- a/src/components/AdminSettings/HostedSignalingServer.vue
+++ b/src/components/AdminSettings/HostedSignalingServer.vue
@@ -8,7 +8,7 @@
 		id="hosted_signaling_server"
 		class="hosted-signaling section">
 		<h2>
-			{{ t('spreed', 'Hosted high-performance backend') }}
+			{{ t('spreed', 'Hosted High-performance backend') }}
 		</h2>
 
 		<p class="settings-hint">
diff --git a/src/components/AdminSettings/RecordingServers.vue b/src/components/AdminSettings/RecordingServers.vue
index d9d8de43f2d..039c0986134 100644
--- a/src/components/AdminSettings/RecordingServers.vue
+++ b/src/components/AdminSettings/RecordingServers.vue
@@ -12,7 +12,7 @@
 
 		<NcNoteCard v-if="!showForm"
 			type="warning"
-			:text="t('spreed', 'Recording backend configuration is only possible with a high-performance backend.')" />
+			:text="t('spreed', 'Recording backend configuration is only possible with a High-performance backend.')" />
 
 		<template v-else>
 			<NcNoteCard v-if="showUploadLimitWarning" type="warning" :text="uploadLimitWarning" />
diff --git a/src/components/AdminSettings/SIPBridge.vue b/src/components/AdminSettings/SIPBridge.vue
index f715a6a2f72..70c7be5460f 100644
--- a/src/components/AdminSettings/SIPBridge.vue
+++ b/src/components/AdminSettings/SIPBridge.vue
@@ -9,7 +9,7 @@
 
 		<NcNoteCard v-if="!showForm"
 			type="warning"
-			:text="t('spreed', 'SIP configuration is only possible with a high-performance backend.')" />
+			:text="t('spreed', 'SIP configuration is only possible with a High-performance backend.')" />
 
 		<template v-else>
 			<NcCheckboxRadioSwitch v-model="dialOutEnabled"
diff --git a/src/components/AdminSettings/SignalingServers.vue b/src/components/AdminSettings/SignalingServers.vue
index 8a3d1f3b8b1..ad0c2f85629 100644
--- a/src/components/AdminSettings/SignalingServers.vue
+++ b/src/components/AdminSettings/SignalingServers.vue
@@ -5,17 +5,22 @@
 
 <template>
 	<section id="signaling_server" class="signaling-servers section">
+		<NcNoteCard v-if="!servers.length"
+			type="error"
+			:heading="t('spreed', 'Nextcloud Talk setup not complete')"
+			:text="t('spreed', 'Install the High-performance backend to ensure calls with multiple participants work seamlessly.')" />
+
 		<h2>
 			{{ t('spreed', 'High-performance backend') }}
 		</h2>
 
 		<p class="settings-hint">
-			{{ t('spreed', 'An external signaling server should optionally be used for larger installations. Leave empty to use the internal signaling server.') }}
+			{{ t('spreed', 'The High-performance backend is required for calls and conversations with multiple participants. Without the backend, all participants have to upload their own video individually for each other participant, which will most likely cause connectivity issues and a high load on participating devices.') }}
 		</p>
 
-		<NcNoteCard v-if="!isCacheConfigured"
+		<NcNoteCard v-if="servers.length && !isCacheConfigured"
 			type="warning"
-			:text="t('spreed', 'It is highly recommended to set up a distributed cache when using Nextcloud Talk together with a High Performance Back-end.')" />
+			:text="t('spreed', 'It is highly recommended to set up a distributed cache when using Nextcloud Talk with a High-performance backend.')" />
 
 		<TransitionWrapper v-if="servers.length"
 			name="fade"
@@ -40,21 +45,11 @@
 				<span v-if="loading" class="icon icon-loading-small" />
 				<Plus v-else :size="20" />
 			</template>
-			{{ t('spreed', 'Add a new high-performance backend server') }}
+			{{ t('spreed', 'Add High-performance backend server') }}
 		</NcButton>
 
-		<template v-if="!servers.length">
-			<p class="settings-hint additional-top-margin">
-				{{ t('spreed', 'Please note that in calls with more than 4 participants without external signaling server, participants can experience connectivity issues and cause high load on participating devices.') }}
-			</p>
-			<NcCheckboxRadioSwitch v-model="hideWarning"
-				:disabled="loading"
-				@update:model-value="updateHideWarning">
-				{{ t('spreed', 'Don\'t warn about connectivity issues in calls with more than 4 participants') }}
-			</NcCheckboxRadioSwitch>
-		</template>
-
-		<NcPasswordField v-model="secret"
+		<NcPasswordField v-if="servers.length"
+			v-model="secret"
 			class="form__textfield additional-top-margin"
 			name="signaling_secret"
 			as-text
@@ -63,6 +58,18 @@
 			:label="t('spreed', 'Shared secret')"
 			label-visible
 			@update:model-value="debounceUpdateServers" />
+
+		<template v-if="!servers.length">
+			<NcNoteCard type="warning"
+				class="additional-top-margin"
+				:text="t('spreed', 'Please note that in calls with more than 2 participants without the High-performance backend, participants will most likely experience connectivity issues and cause high load on participating devices.')" />
+			<NcCheckboxRadioSwitch v-model="hideWarning"
+				:disabled="loading"
+				@update:model-value="updateHideWarning">
+				{{ t('spreed', 'Don\'t warn about connectivity issues in calls with more than 2 participants') }}
+			</NcCheckboxRadioSwitch>
+		</template>
+
 	</section>
 </template>
 
@@ -134,7 +141,7 @@ export default {
 		newServer() {
 			this.servers.push({
 				server: '',
-				verify: false,
+				verify: true,
 			})
 		},
 
@@ -143,7 +150,7 @@ export default {
 
 			OCP.AppConfig.setValue('spreed', 'hide_signaling_warning', this.hideWarning ? 'yes' : 'no', {
 				success: () => {
-					showSuccess(t('spreed', 'Missing high-performance backend warning hidden'))
+					showSuccess(t('spreed', 'Missing High-performance backend warning hidden'))
 					this.loading = false
 					this.toggleSave()
 				},
@@ -186,6 +193,6 @@ export default {
 }
 
 .additional-top-margin {
-	margin-top: 10px;
+	margin-top: 35px !important;
 }
 </style>
diff --git a/src/views/AdminSettings.vue b/src/views/AdminSettings.vue
index 7717e807c0f..dff38506eca 100644
--- a/src/views/AdminSettings.vue
+++ b/src/views/AdminSettings.vue
@@ -5,18 +5,18 @@
 
 <template>
 	<div>
+		<SignalingServers />
+		<HostedSignalingServer />
 		<GeneralSettings />
-		<MatterbridgeIntegration />
 		<AllowedGroups />
 		<Federation v-if="supportFederation" />
 		<BotsSettings />
 		<WebServerSetupChecks />
 		<StunServers />
 		<TurnServers />
-		<SignalingServers />
-		<HostedSignalingServer />
 		<RecordingServers />
 		<SIPBridge />
+		<MatterbridgeIntegration />
 	</div>
 </template>