diff --git a/resources/views/pages/partials/dashboard-nav-tabs.blade.php b/resources/views/pages/partials/dashboard-nav-tabs.blade.php
index 73fdef5..e8b85bc 100644
--- a/resources/views/pages/partials/dashboard-nav-tabs.blade.php
+++ b/resources/views/pages/partials/dashboard-nav-tabs.blade.php
@@ -6,10 +6,10 @@
     <li class="{{ Request::segment(1) == 'profile' ? 'active' : '' }}">
         {!! link_to_route('users.profile.show', trans('auth.profile')) !!}
     </li>
-    @can('manage_agency')
         <li class="{{ Request::segment(1) == 'agency' ? 'active' : '' }}">
             {!! link_to_route('users.agency.show', trans('nav_menu.agency')) !!}
         </li>
+    @can('manage_agency')
         <li class="{{ Request::segment(1) == 'users' ? 'active' : '' }}">
             {!! link_to_route('users.index', trans('user.list')) !!}
         </li>
diff --git a/resources/views/users/agency/show.blade.php b/resources/views/users/agency/show.blade.php
index 1bb8d14..25e375e 100644
--- a/resources/views/users/agency/show.blade.php
+++ b/resources/views/users/agency/show.blade.php
@@ -11,7 +11,9 @@
         <h3 class="text-primary">{{ Option::get('agency_name') }}</h3>
         <p>{{ Option::get('agency_tagline') }}</p>
         <br>
-        {{ link_to_route('users.agency.edit', trans('agency.edit'), [], ['class' => 'btn btn-info']) }}
+        @can('manage_agency')
+            {{ link_to_route('users.agency.edit', trans('agency.edit'), [], ['class' => 'btn btn-info']) }}
+        @endcan
     </div>
     <div class="col-md-8">
         <legend style="border-bottom: none;margin-bottom: 10px; margin-left: 6px;">
diff --git a/routes/web/account.php b/routes/web/account.php
index dd975f0..f104d5e 100644
--- a/routes/web/account.php
+++ b/routes/web/account.php
@@ -26,48 +26,48 @@ Route::post('password/reset', 'Auth\ResetPasswordController@reset')->name('reset
 Route::get('profile', [
     'as'         => 'users.profile.show',
     'uses'       => 'Users\ProfileController@show',
-    'middleware' => ['web', 'auth'],
+    'middleware' => ['auth'],
 ]);
 
 Route::get('profile/edit', [
     'as'         => 'users.profile.edit',
     'uses'       => 'Users\ProfileController@edit',
-    'middleware' => ['web', 'auth'],
+    'middleware' => ['auth'],
 ]);
 
 Route::patch('profile/update', [
     'as'         => 'users.profile.update',
     'uses'       => 'Users\ProfileController@update',
-    'middleware' => ['web', 'auth'],
+    'middleware' => ['auth'],
 ]);
 
 Route::patch('profile/switch-lang', [
     'as'         => 'users.profile.switch-lang',
     'uses'       => 'Users\ProfileController@switchLang',
-    'middleware' => ['web', 'auth'],
+    'middleware' => ['auth'],
 ]);
 
 // User's Agency routes
 Route::get('agency', [
     'as'         => 'users.agency.show',
     'uses'       => 'Users\AgencyController@show',
-    'middleware' => ['web', 'auth'],
+    'middleware' => ['auth'],
 ]);
 
 Route::get('agency/edit', [
     'as'         => 'users.agency.edit',
     'uses'       => 'Users\AgencyController@edit',
-    'middleware' => ['web', 'role:admin'],
+    'middleware' => ['role:admin'],
 ]);
 
 Route::patch('agency/update', [
     'as'         => 'users.agency.update',
     'uses'       => 'Users\AgencyController@update',
-    'middleware' => ['web', 'role:admin'],
+    'middleware' => ['role:admin'],
 ]);
 
 Route::patch('agency/logo-upload', [
     'as'         => 'users.agency.logo-upload',
     'uses'       => 'Users\AgencyController@logoUpload',
-    'middleware' => ['web', 'role:admin'],
+    'middleware' => ['role:admin'],
 ]);