diff --git a/application/WorkorderCompany/WorkorderCompanyController.php b/application/WorkorderCompany/WorkorderCompanyController.php
index 879669f83..3861ae008 100644
--- a/application/WorkorderCompany/WorkorderCompanyController.php
+++ b/application/WorkorderCompany/WorkorderCompanyController.php
@@ -35,6 +35,11 @@ class WorkorderCompanyController extends WorkorderBaseController {
         parent::indexAction();
     }
 
+    protected function logout() {
+        mfLoginController::staticLogout();
+        $this->redirect('/WorkorderCompany/Mobile');
+    }
+
     public function mobileAction() {
         $company = WorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]);
 
diff --git a/lib/TTCrud/TTCrud.php b/lib/TTCrud/TTCrud.php
index 8967131dd..e8f74e82c 100644
--- a/lib/TTCrud/TTCrud.php
+++ b/lib/TTCrud/TTCrud.php
@@ -43,7 +43,7 @@ class TTCrud extends mfBaseController {
 
         if (method_exists($this, 'permissionsCheckOverride'))
             $this->permissionsCheckOverride();
-        else if (!$permissionAllowed && !$this->user->is(["Admin"]))
+        else if (mfLoginController::isLoggedIn() && !$permissionAllowed && !$this->user->is(["Admin"]))
             $this->redirect("Dashboard");
 
         $c = get_class($this);