diff --git a/app/Http/ViewComposers/Menu.php b/app/Http/ViewComposers/Menu.php
index ea68d7d5e..7c8dd8d75 100644
--- a/app/Http/ViewComposers/Menu.php
+++ b/app/Http/ViewComposers/Menu.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\ViewComposers;
 
-use Auth;
 use Illuminate\View\View;
 use anlutro\LaravelSettings\Facade as Settingg;
 
@@ -17,17 +16,16 @@ class Menu
     public function compose(View $view)
     {
         $customer = null;
-        $company_id = session('company_id');
+        $user = auth()->user();
 
         // Get all companies
-        $companies = Auth::user()->companies()->limit(10)->get()->sortBy('name');
-        foreach ($companies as $com) {
+        $companies = $user->companies()->enabled()->limit(10)->get()->each(function ($com) {
             $com->setSettings();
-        }
+        })->sortBy('name');
 
         // Get customer
-        if (Auth::user()->customer) {
-            $customer = Auth::user();
+        if ($user->customer) {
+            $customer = $user;
         }
 
         $view->with(['companies' => $companies, 'customer' => $customer]);
diff --git a/app/Listeners/Auth/Login.php b/app/Listeners/Auth/Login.php
index 2efd3e597..9ca023309 100644
--- a/app/Listeners/Auth/Login.php
+++ b/app/Listeners/Auth/Login.php
@@ -17,7 +17,7 @@ class Login
     public function handle(ILogin $event)
     {
         // Get first company
-        $company = $event->user->companies()->first();
+        $company = $event->user->companies()->enabled()->first();
         
         // Logout if no company assigned
         if (!$company) {
diff --git a/app/Models/Company/Company.php b/app/Models/Company/Company.php
index a9ecf4ff2..eb2d11247 100644
--- a/app/Models/Company/Company.php
+++ b/app/Models/Company/Company.php
@@ -204,6 +204,18 @@ class Company extends Eloquent
         return Auth::user()->companies()->filter($input)->sortable($sort)->paginate($limit);
     }
 
+    /**
+     * Scope to only include companies of a given enabled value.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed $value
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeEnabled($query, $value = 1)
+    {
+        return $query->where('enabled', $value);
+    }
+
     /**
      * Sort by company name
      *
diff --git a/resources/views/companies/companies/index.blade.php b/resources/views/companies/companies/index.blade.php
index 542832912..e18a65b10 100644
--- a/resources/views/companies/companies/index.blade.php
+++ b/resources/views/companies/companies/index.blade.php
@@ -62,7 +62,9 @@
                                     <i class="fa fa-ellipsis-h"></i>
                                 </button>
                                 <ul class="dropdown-menu dropdown-menu-right">
+                                    @if ($item->enabled)
                                     <li><a href="{{ url('companies/companies/' . $item->id . '/set') }}">{{ trans('general.switch') }}</a></li>
+                                    @endif
                                     <li><a href="{{ url('companies/companies/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
                                     @permission('delete-companies-companies')
                                     <li>{!! Form::deleteLink($item, 'companies/companies', '', 'company_name') !!}</li>