diff --git a/app/Controller/UserStatus.php b/app/Controller/UserStatusController.php
similarity index 96%
rename from app/Controller/UserStatus.php
rename to app/Controller/UserStatusController.php
index 6f93e9534..2b23505c1 100644
--- a/app/Controller/UserStatus.php
+++ b/app/Controller/UserStatusController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * User Status Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class UserStatus extends BaseController
+class UserStatusController extends BaseController
 {
     /**
      * Confirm remove a user
diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index 9c845905c..82f61e111 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -140,7 +140,7 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('UserImportController', '*', Role::APP_ADMIN);
         $acl->add('UserCreationController', '*', Role::APP_ADMIN);
         $acl->add('User', array('index', 'authentication'), Role::APP_ADMIN);
-        $acl->add('UserStatus', '*', Role::APP_ADMIN);
+        $acl->add('UserStatusController', '*', Role::APP_ADMIN);
 
         return $acl;
     }
diff --git a/app/Template/user/dropdown.php b/app/Template/user/dropdown.php
index b74ed6e08..086bf01b4 100644
--- a/app/Template/user/dropdown.php
+++ b/app/Template/user/dropdown.php
@@ -5,23 +5,23 @@
             <i class="fa fa-user fa-fw"></i>
             <?= $this->url->link(t('View profile'), 'user', 'show', array('user_id' => $user['id'])) ?>
         </li>
-        <?php if ($user['is_active'] == 1 && $this->user->hasAccess('UserStatus', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?>
+        <?php if ($user['is_active'] == 1 && $this->user->hasAccess('UserStatusController', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?>
             <li>
                 <i class="fa fa-times fa-fw"></i>
-                <?= $this->url->link(t('Disable'), 'UserStatus', 'confirmDisable', array('user_id' => $user['id']), false, 'popover') ?>
+                <?= $this->url->link(t('Disable'), 'UserStatusController', 'confirmDisable', array('user_id' => $user['id']), false, 'popover') ?>
             </li>
         <?php endif ?>
-        <?php if ($user['is_active'] == 0 && $this->user->hasAccess('UserStatus', 'enable') && ! $this->user->isCurrentUser($user['id'])): ?>
+        <?php if ($user['is_active'] == 0 && $this->user->hasAccess('UserStatusController', 'enable') && ! $this->user->isCurrentUser($user['id'])): ?>
             <li>
                 <i class="fa fa-check-square-o fa-fw"></i>
-                <?= $this->url->link(t('Enable'), 'UserStatus', 'confirmEnable', array('user_id' => $user['id']), false, 'popover') ?>
+                <?= $this->url->link(t('Enable'), 'UserStatusController', 'confirmEnable', array('user_id' => $user['id']), false, 'popover') ?>
             </li>
         <?php endif ?>
-        <?php if ($this->user->hasAccess('UserStatus', 'remove') && ! $this->user->isCurrentUser($user['id'])): ?>
+        <?php if ($this->user->hasAccess('UserStatusController', 'remove') && ! $this->user->isCurrentUser($user['id'])): ?>
             <li>
                 <i class="fa fa-trash-o fa-fw"></i>
-                <?= $this->url->link(t('Remove'), 'UserStatus', 'confirmRemove', array('user_id' => $user['id']), false, 'popover') ?>
+                <?= $this->url->link(t('Remove'), 'UserStatusController', 'confirmRemove', array('user_id' => $user['id']), false, 'popover') ?>
             </li>
         <?php endif ?>
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/user_status/disable.php b/app/Template/user_status/disable.php
index 90d8c7578..b551b3b8d 100644
--- a/app/Template/user_status/disable.php
+++ b/app/Template/user_status/disable.php
@@ -6,7 +6,7 @@
     <p class="alert alert-info"><?= t('Do you really want to disable this user: "%s"?', $user['name'] ?: $user['username']) ?></p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'UserStatus', 'disable', array('user_id' => $user['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'UserStatusController', 'disable', array('user_id' => $user['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?>
     </div>
diff --git a/app/Template/user_status/enable.php b/app/Template/user_status/enable.php
index cd3d49471..fe527047c 100644
--- a/app/Template/user_status/enable.php
+++ b/app/Template/user_status/enable.php
@@ -6,7 +6,7 @@
     <p class="alert alert-info"><?= t('Do you really want to enable this user: "%s"?', $user['name'] ?: $user['username']) ?></p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'UserStatus', 'enable', array('user_id' => $user['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'UserStatusController', 'enable', array('user_id' => $user['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?>
     </div>
diff --git a/app/Template/user_status/remove.php b/app/Template/user_status/remove.php
index cd5c09a60..c84580927 100644
--- a/app/Template/user_status/remove.php
+++ b/app/Template/user_status/remove.php
@@ -6,7 +6,7 @@
     <p class="alert alert-info"><?= t('Do you really want to remove this user: "%s"?', $user['name'] ?: $user['username']) ?></p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'UserStatus', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'UserStatusController', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?>
     </div>