diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php
index ab87c484db..3d4dc5cc98 100644
--- a/lib/private/legacy/user.php
+++ b/lib/private/legacy/user.php
@@ -270,7 +270,7 @@ class OC_User {
 		}
 
 		$logoutUrl = $urlGenerator->linkToRouteAbsolute('core.login.logout');
-		$logoutUrl .= '?requesttoken=' . \OCP\Util::callRegister();
+		$logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister());
 
 		return $logoutUrl;
 	}
diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php
index 6649aba28b..f552bd2eee 100644
--- a/tests/lib/NavigationManagerTest.php
+++ b/tests/lib/NavigationManagerTest.php
@@ -270,7 +270,7 @@ class NavigationManagerTest extends TestCase {
 			'logout' => [
 				'id'      => 'logout',
 				'order'   => 99999,
-				'href'    => 'https://example.com/logout?requesttoken='. \OCP\Util::callRegister(),
+				'href'    => 'https://example.com/logout?requesttoken='. urlencode(\OCP\Util::callRegister()),
 				'icon'    => '/apps/core/img/actions/logout.svg',
 				'name'    => 'Log out',
 				'active'  => false,