diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 6c1fe71e4e9c5..00b1f1623ca47 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -119,17 +119,18 @@ public function getPageTemplate(string $renderAs, string $appId): ITemplate {
 				}
 
 				$user = Server::get(IUserSession::class)->getUser();
+				$userId = $user?->getUID();
 
-				if ($user === null) {
+				if (empty($userId)) {
 					$page->assign('user_uid', false);
 					$page->assign('user_displayname', false);
 					$page->assign('userAvatarSet', false);
 					$page->assign('userStatus', false);
 				} else {
-					$page->assign('user_uid', $user->getUID());
+					$page->assign('user_uid', $userId);
 					$page->assign('user_displayname', $user->getDisplayName());
 					$page->assign('userAvatarSet', true);
-					$page->assign('userAvatarVersion', $this->config->getUserValue($user->getUID(), 'avatar', 'version', 0));
+					$page->assign('userAvatarVersion', $this->config->getUserValue($userId, 'avatar', 'version', 0));
 				}
 				break;
 			case TemplateResponse::RENDER_AS_ERROR:
@@ -143,14 +144,16 @@ public function getPageTemplate(string $renderAs, string $appId): ITemplate {
 				Util::addStyle('guest');
 				$page->assign('bodyid', 'body-login');
 
-				$userDisplayName = false;
 				$user = Server::get(IUserSession::class)->getUser();
-				if ($user) {
-					$userDisplayName = $user->getDisplayName();
-				}
+				$userId = $user?->getUID();
 
-				$page->assign('user_displayname', $userDisplayName);
-				$page->assign('user_uid', \OC_User::getUser());
+				if (empty($userId)) {
+					$page->assign('user_displayname', false);
+					$page->assign('user_uid', false);
+				} else {
+					$page->assign('user_displayname', $user->getDisplayName());
+					$page->assign('user_uid', $userId);
+				}
 				break;
 			case TemplateResponse::RENDER_AS_PUBLIC:
 				$page = $this->templateManager->getTemplate('core', 'layout.public');