diff --git a/lib/UserBackend.php b/lib/UserBackend.php
index 20717a5c3..4856344b2 100644
--- a/lib/UserBackend.php
+++ b/lib/UserBackend.php
@@ -11,6 +11,7 @@
 use OCA\User_SAML\Model\SessionData;
 use OCP\Authentication\IApacheBackend;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\IRootFolder;
 use OCP\Files\NotPermittedException;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -118,7 +119,7 @@ public function createUserIfNotExists(string $uid, array $attributes = []): void
 	public function initializeHomeDir(string $uid): void {
 		### Code taken from lib/private/User/Session.php - function prepareUserLogin() ###
 		//trigger creation of user home and /files folder
-		$userFolder = \OC::$server->getUserFolder($uid);
+		$userFolder = Server::get(IRootFolder::class)->getUserFolder($uid);
 		try {
 			// copy skeleton
 			\OC_Util::copySkeleton($uid, $userFolder);
diff --git a/templates/admin.php b/templates/admin.php
index 2534fe997..1bacd3210 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -7,6 +7,8 @@
 style('user_saml', 'admin');
 
 /** @var array $_ */
+$urlGenerator = \OCP\Server::get(\OCP\IURLGenerator::class);
+
 ?>
 <form id="user-saml" class="section" action="#" method="post" data-type="<?php p($_['type']) ?>">
 	<h2 class="inlineblock"><?php p($l->t('SSO & SAML authentication')); ?></h2>
@@ -20,7 +22,7 @@
 
 	<div class="warning hidden" id="user-saml-warning-admin-user">
 		<?php
-		$url = \OC::$server->getURLGenerator()->linkToRouteAbsolute('core.login.showLoginForm') . '?direct=1';
+		$url = $urlGenerator->linkToRouteAbsolute('core.login.showLoginForm') . '?direct=1';
 $url = '<a href="' . $url . '">' . \OCP\Util::sanitizeHTML($url) . '</a>';
 if (isset($_['general']['allow_multiple_user_back_ends']['text'])) {
 	print_unescaped(
@@ -245,8 +247,8 @@
 			</div>
 		</div>
 
-		<a id="get-metadata" data-base="<?php p(\OC::$server->getURLGenerator()->linkToRoute('user_saml.SAML.getMetadata')); ?>"
-		   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('user_saml.SAML.getMetadata', ['idp' => $_['providers'][0]['id']])) ?>" class="button">
+		<a id="get-metadata" data-base="<?php p($urlGenerator->linkToRoute('user_saml.SAML.getMetadata')); ?>"
+		   href="<?php p($urlGenerator->linkToRoute('user_saml.SAML.getMetadata', ['idp' => $_['providers'][0]['id']])) ?>" class="button">
 			<?php p($l->t('Download metadata XML')) ?>
 		</a>
 
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 4dfbc8211..e21beaf45 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -3,7 +3,7 @@
  - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
+<files psalm-version="6.14.3@d0b040a91f280f071c1abcb1b77ce3822058725a">
   <file src="lib/Controller/SAMLController.php">
     <RedundantCondition>
       <code><![CDATA[!$userExists]]></code>
@@ -43,9 +43,12 @@
       <code><![CDATA[$offset]]></code>
       <code><![CDATA[$offset]]></code>
     </InvalidArgument>
+    <MissingDependency>
+      <code><![CDATA[IRootFolder]]></code>
+    </MissingDependency>
     <UndefinedClass>
       <code><![CDATA[\OC]]></code>
-      <code><![CDATA[\OC]]></code>
+      <code><![CDATA[\OC_Util]]></code>
     </UndefinedClass>
     <UndefinedInterfaceMethod>
       <code><![CDATA[setDisplayName]]></code>