diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 0db8d555dc..bd3a22346d 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -414,8 +414,6 @@ public function getFontFileOverview(string $name): DataDisplayResponse {
 
 	/**
 	 * @NoAdminRequired
-	 * @PublicPage
-	 * @NoCSRFRequired
 	 *
 	 * @param string $type - Type is 'admin' or 'user'
 	 * @return DataResponse
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 09d916dbce..30fa65ce32 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -217,14 +217,13 @@
 			</div>
 		</NcModal>
 
-		<div id="admin-cool-frame-section" class="section">
-			<CoolFrame v-if="tokenGenerated"
-				:iframe-type="'admin'"
-				:public-wopi-url="settings.public_wopi_url"
-				:access-token="accessToken"
-				:access-token-t-t-l="accessTokenTTL"
-				:wopi-setting-base-url="wopiSettingBaseUrl" />
-		</div>
+		<CoolFrame v-if="tokenGenerated"
+			class="section"
+			:iframe-type="'admin'"
+			:public-wopi-url="settings.public_wopi_url"
+			:access-token="accessToken"
+			:access-token-t-t-l="accessTokenTTL"
+			:wopi-setting-base-url="wopiSettingBaseUrl" />
 
 		<div v-if="isSetup" id="advanced-settings" class="section">
 			<h2>{{ t('richdocuments', 'Advanced settings') }}</h2>
@@ -432,10 +431,7 @@ import SettingsExternalApps from './SettingsExternalApps.vue'
 import SettingsInputFile from './SettingsInputFile.vue'
 import SettingsFontList from './SettingsFontList.vue'
 import GlobalTemplates from './AdminSettings/GlobalTemplates.vue'
-import {
-	getCurrentUser,
-	getGuestNickname,
-} from '@nextcloud/auth'
+import { getCurrentUser } from '@nextcloud/auth'
 
 import { isPublicShare, getSharingToken } from '@nextcloud/sharing/public'
 
@@ -531,7 +527,7 @@ export default {
 			},
 			accessToken: '',
 			accessTokenTTL: '',
-			userId: '',
+			userId: getCurrentUser()?.uid,
 			tokenGenerated: false,
 			wopiSettingBaseUrl: '',
 		}
@@ -579,9 +575,7 @@ export default {
 		},
 	},
 	async mounted() {
-		const currentUser = getCurrentUser()
-		if (currentUser && currentUser.uid) {
-			this.userId = currentUser.uid
+		if (this.userId && this.userId.length > 0) {
 			await this.generateAccessToken()
 			if (this.accessToken) {
 				this.wopiSettingBaseUrl = getConfigFileUrl()
@@ -644,8 +638,6 @@ export default {
 				this.accessToken = data.token
 				this.accessTokenTTL = data.token_ttl
 				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
-			} else if (data.federatedUrl) {
-				console.error('Federated URL returned, not expected for admin settings.')
 			} else {
 				console.error('Failed to generate token for admin settings')
 			}
diff --git a/src/components/PersonalSettings.vue b/src/components/PersonalSettings.vue
index df5be2649b..4638ea2867 100644
--- a/src/components/PersonalSettings.vue
+++ b/src/components/PersonalSettings.vue
@@ -35,14 +35,12 @@
 		</p>
 
 		<!-- user settings iframe  -->
-		<div id="user-cool-frame-section">
-			<CoolFrame v-if="tokenGenerated"
-				:iframe-type="'user'"
-				:public-wopi-url="public_wopi_url"
-				:access-token="accessToken"
-				:access-token-t-t-l="accessTokenTTL"
-				:wopi-setting-base-url="wopiSettingBaseUrl" />
-		</div>
+		<CoolFrame v-if="tokenGenerated"
+			:iframe-type="'user'"
+			:public-wopi-url="public_wopi_url"
+			:access-token="accessToken"
+			:access-token-t-t-l="accessTokenTTL"
+			:wopi-setting-base-url="wopiSettingBaseUrl" />
 
 		<!-- Zotero -->
 		<div class="zotero-section">
@@ -168,7 +166,7 @@ export default {
 			tokenGenerated: false,
 			accessToken: '',
 			accessTokenTTL: '',
-			userId: '',
+			userId: getCurrentUser()?.uid,
 			wopiSettingBaseUrl: '',
 			public_wopi_url: this.initial.publicWopiUrl || '',
 		}
@@ -179,9 +177,7 @@ export default {
 		},
 	},
 	async mounted() {
-		const currentUser = getCurrentUser()
-		if (currentUser && currentUser.uid) {
-			this.userId = currentUser.uid
+		if (this.userId && this.userId.length > 0) {
 			await this.generateAccessToken()
 			if (this.accessToken) {
 				this.wopiSettingBaseUrl = getConfigFileUrl()
@@ -199,8 +195,6 @@ export default {
 				this.accessToken = data.token
 				this.accessTokenTTL = data.token_ttl
 				console.debug('Admin settings WOPI token generated:', this.accessToken, this.accessTokenTTL)
-			} else if (data.federatedUrl) {
-				console.error('Federated URL returned, not expected for admin settings.')
 			} else {
 				console.error('Failed to generate token for admin settings')
 			}
diff --git a/src/helpers/url.js b/src/helpers/url.js
index c9bcae104c..40b77cfaa8 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -82,7 +82,7 @@ const getDocumentUrlForFile = (fileDir, fileId) => {
 }
 
 export const getConfigFileUrl = () => {
-	return getCallbackBaseUrl() + '/index.php/apps/richdocuments/wopi/settings'
+	return getCallbackBaseUrl() + generateUrl('apps/richdocuments/wopi/settings')
 }
 
 const getNextcloudUrl = () => {
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index b91cb8f1ba..81a432d72c 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -125,9 +125,4 @@
       <code><![CDATA[$result && count($result) > 0]]></code>
     </RedundantCondition>
   </file>
-  <file src="lib/WOPI/SettingsUrl.php">
-    <RedundantCondition>
-      <code><![CDATA[$result && count($result) > 0]]></code>
-    </RedundantCondition>
-  </file>
 </files>