diff --git a/application/Espo/Controllers/Settings.php b/application/Espo/Controllers/Settings.php
index 098bfe07c6..bfb359659b 100644
--- a/application/Espo/Controllers/Settings.php
+++ b/application/Espo/Controllers/Settings.php
@@ -121,15 +121,10 @@ class Settings
     private function getConfigData(): stdClass
     {
         $data = $this->service->getConfigData();
+        $metadataData = $this->service->getMetadataConfigData();
 
-        $data->jsLibs = $this->metadata->get(['app', 'jsLibs']);
-
-        unset($data->loginView);
-
-        $loginView = $this->metadata->get(['clientDefs', 'App', 'loginView']);
-
-        if ($loginView) {
-            $data->loginView = $loginView;
+        foreach (get_object_vars($metadataData) as $key => $value) {
+            $data->$key = $value;
         }
 
         return $data;
diff --git a/application/Espo/Services/Settings.php b/application/Espo/Services/Settings.php
index cc2d107785..f899580bda 100644
--- a/application/Espo/Services/Settings.php
+++ b/application/Espo/Services/Settings.php
@@ -99,6 +99,23 @@ class Settings
         return $data;
     }
 
+    public function getMetadataConfigData(): stdClass
+    {
+        $data = (object) [];
+
+        $data->jsLibs = $this->metadata->get(['app', 'jsLibs']);
+
+        unset($data->loginView);
+
+        $loginView = $this->metadata->get(['clientDefs', 'App', 'loginView']);
+
+        if ($loginView) {
+            $data->loginView = $loginView;
+        }
+
+        return $data;
+    }
+
     /**
      * @throws \Espo\Core\Exceptions\BadRequest
      * @throws Forbidden