diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 7867013d2d4d..c9047f93d800 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -419,11 +419,11 @@
                 'expenses',
                 'vendors',
             ] as $option)
-            @if (in_array($option, ['dashboard', 'settings'])
-                || Auth::user()->can('view', substr($option, 0, -1))
-                || Auth::user()->can('create', substr($option, 0, -1)))
-                @include('partials.navigation_option')
-            @endif
+                @if(!Auth::user()->account->isModuleEnabled(substr($option, 0, -1)))
+                    {{ '' }}
+                @else
+                    @include('partials.navigation_option')
+                @endif
             @endforeach
             @if ( ! Utils::isNinjaProd())
                 @foreach (Module::collections() as $module)
diff --git a/resources/views/partials/navigation_option.blade.php b/resources/views/partials/navigation_option.blade.php
index ca1d13d6aee3..0f40339a275c 100644
--- a/resources/views/partials/navigation_option.blade.php
+++ b/resources/views/partials/navigation_option.blade.php
@@ -10,6 +10,8 @@
             href="{{ url('/reports/calendar') }}">
             <i class="fa fa-calendar" style="width:20px"></i>
         </a>
+    @elseif ($option == 'dashboard')
+        
     @elseif (Auth::user()->can('create', $option) || Auth::user()->can('create', substr($option, 0, -1)))
         <a type="button" class="btn btn-primary btn-sm pull-right"
             href="{{ url("/{$option}/create") }}">