diff --git a/lib/base.php b/lib/base.php
index b945ba3ee1d..3277f0c42e0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -850,6 +850,7 @@ class OC {
 
 		// Make sure that the application class is not loaded before the database is setup
 		if ($systemConfig->getValue('installed', false)) {
+			$appManager->loadApp('core');
 			$appManager->loadApp('settings');
 		}
 
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 1f918257337..d4521edabfc 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -1187,8 +1187,11 @@ class AppManager implements IAppManager {
 
 	#[\Override]
 	public function getAppNamespace(string $appId): string {
-		$topNamespace = 'OCA\\';
+		if ($appId === 'core') {
+			return 'OC\\Core';
+		}
 
+		$topNamespace = 'OCA\\';
 		// Hit the cache!
 		if (isset($this->namespaceCache[$appId])) {
 			return $topNamespace . $this->namespaceCache[$appId];
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index 041b1a7312d..f5a9d995c7b 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -212,10 +212,6 @@ class NavigationManager implements INavigationManager {
 		}
 
 		foreach ($apps as $app) {
-			if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
-				continue;
-			}
-
 			// load plugins and collections from info.xml
 			$info = $this->appManager->getAppInfo($app);
 			if (!isset($info['navigations']['navigation'])) {
@@ -261,14 +257,14 @@ class NavigationManager implements INavigationManager {
 					'order' => $order,
 					// Target of the navigation entry
 					'href' => $route,
-					// The icon used for the naviation entry
+					// The icon used for the navigation entry
 					'icon' => $icon,
 					// Type of the navigation entry ('link' vs 'settings')
 					'type' => $type,
 					// Localized name of the navigation entry
 					'name' => $l->t($nav['name']),
 				], $type === 'link' ? [
-					// App that registered this navigation entry (not necessarly the same as the id)
+					// App that registered this navigation entry (not necessarily the same as the id)
 					'app' => $app,
 				] : []
 				));