diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 553df8dae94d..0df2aca24ed7 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -30,6 +30,7 @@ use App\Ninja\Repositories\ReferralRepository;
 use App\Services\AuthService;
 use App\Services\PaymentService;
 use App\Services\TemplateService;
+use Nwidart\Modules\Facades\Module;
 use Auth;
 use Cache;
 use File;
@@ -758,6 +759,20 @@ class AccountController extends BaseController
         $account = $user->account;
         $modules = Input::get('modules');
 
+        // get all custom modules, including disabled
+        $custom_modules = collect(Input::get('custom_modules'))->each(function ($item, $key) {
+            $module = Module::find($item);
+            if ($module && $module->disabled()) {
+                $module->enable();
+            }
+        });
+
+        (Module::toCollection()->diff($custom_modules))->each(function ($item, $key) {
+            if ($item->enabled()) {
+                $item->disable();
+            }
+        });
+
         $user->force_pdfjs = Input::get('force_pdfjs') ? true : false;
         $user->save();
 
diff --git a/resources/views/accounts/management.blade.php b/resources/views/accounts/management.blade.php
index b01165cfe3ff..4cfc4b2719e3 100644
--- a/resources/views/accounts/management.blade.php
+++ b/resources/views/accounts/management.blade.php
@@ -189,6 +189,14 @@
 							</label>
 						</div>
 						@endforeach
+						@foreach (Module::all() as $value)
+						{{ ($value->boot()) }}
+						<div class="checkbox">
+							<label for="custom_modules_{{ $value }}">
+								<input name="custom_modules[]" id="custom_modules_{{ $value }}" type="checkbox" {{ $value->enabled() ? 'checked="checked"' : '' }} value="{{ $value }}">{{ mtrans($value, $value->getLowerName()) }}
+							</label>
+						</div>
+						@endforeach
 					</div>
 				</div>
 				<div class="form-group">
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 616d42a9ca56..eb5944da2af8 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -392,7 +392,7 @@
                 @endif
             @endforeach
             @if ( ! Utils::isNinjaProd())
-                @foreach (Module::all() as $module)
+                @foreach (Module::collections() as $module)
                     @include('partials.navigation_option', [
                         'option' => $module->getAlias(),
                         'icon' => $module->get('icon', 'th-large'),