diff --git a/application/Espo/Services/Settings.php b/application/Espo/Services/Settings.php
index 336dc54720..0546a789f2 100644
--- a/application/Espo/Services/Settings.php
+++ b/application/Espo/Services/Settings.php
@@ -110,6 +110,12 @@ class Settings extends \Espo\Core\Services\Base
             }
         }
 
+        unset($data->loginView);
+        $loginView = $this->getMetadata()->get(['clientDefs', 'App', 'loginView']);
+        if ($loginView) {
+            $data->loginView = $loginView;
+        }
+
         $this->filterData($data);
 
         return $data;
diff --git a/client/src/controllers/base.js b/client/src/controllers/base.js
index 4cd903527b..432c17f3a7 100644
--- a/client/src/controllers/base.js
+++ b/client/src/controllers/base.js
@@ -31,7 +31,7 @@ define('controllers/base', 'controller', function (Dep) {
     return Dep.extend({
 
         login: function () {
-            var viewName = this.getMetadata().get(['clientDefs', 'App', 'loginView']) || 'views/login';
+            var viewName = this.getConfig().get('loginView') || 'views/login';
             this.entire(viewName, {}, function (login) {
                 login.render();
                 login.on('login', function (data) {