diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
index c136124c..5c0c2b7b 100644
--- a/app/Composers/AppComposer.php
+++ b/app/Composers/AppComposer.php
@@ -85,5 +85,6 @@ class AppComposer
         $view->withSiteTitle($this->config->get('setting.app_name'));
         $view->withFontSubset($this->config->get('langs.'.$this->config->get('app.locale').'.subset', 'latin'));
         $view->withOnlyDisruptedDays($this->config->get('setting.only_disrupted_days'));
+        $view->withDashboardLink($this->config->get('setting.dashboard_login_link'));
     }
 }
diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
index 3b44beb2..33cdd7fb 100644
--- a/resources/views/partials/footer.blade.php
+++ b/resources/views/partials/footer.blade.php
@@ -16,7 +16,7 @@
             </div>
             <div class="col-sm-8">
                 <ul class="list-inline">
-                    @if($current_user || Config::get('setting.dashboard_login_link'))
+                    @if($current_user || $dashboard_link)
                     <li>
                         <a class="btn btn-link" href="/dashboard">{{ trans('dashboard.dashboard') }}</a>
                     </li>
diff --git a/resources/views/partials/nav.blade.php b/resources/views/partials/nav.blade.php
index 878c7813..6f11b5b7 100644
--- a/resources/views/partials/nav.blade.php
+++ b/resources/views/partials/nav.blade.php
@@ -19,7 +19,7 @@
                         <li><a href="{{ route('auth.logout') }}">{{ trans('dashboard.logout') }}</a></li>
                     </ul>
                 </li>
-                @elseif(Config::get('setting.dashboard_login_link'))
+                @elseif($dashboard_link)
                 <li><a href="/dashboard">{{ trans('dashboard.dashboard') }}</a></li>
                 @endif
             </ul>