diff --git a/core/Access.php b/core/Access.php
index e404e69d9470ec6d0ecec1b2b50fa8ccb7eaab8f..7d35ed72cf5e6d501f74b59e2a69c3c38f9477de 100644
--- a/core/Access.php
+++ b/core/Access.php
@@ -249,7 +249,6 @@ class Access
     /**
      * @see Access::hasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     public function isSuperUser()
     {
@@ -345,7 +344,6 @@ class Access
     /**
      * @see Access::checkUserHasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     public function checksUserIsSuperUser()
     {
diff --git a/core/Piwik.php b/core/Piwik.php
index b3c91a6aa2d7f06321847b85afb19d97a34755a7..000ad8dd8f9aa4adce8135c744d232386ce7a5c8 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -288,7 +288,6 @@ class Piwik
     /**
      * @see Piwik::hasUserSuperUserAccessOrIsTheUser()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function isUserIsSuperUserOrTheUser($theUser)
     {
@@ -298,7 +297,6 @@ class Piwik
     /**
      * @see Piwik::checkUserHasSuperUserAccessOrIsTheUser()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function checkUserIsSuperUserOrTheUser($theUser)
     {
@@ -354,7 +352,6 @@ class Piwik
     /**
      * @see Piwik::hasUserSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function isUserIsSuperUser()
     {
@@ -420,7 +417,6 @@ class Piwik
     /**
      * @see Piwik::setUserHasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function setUserIsSuperUser($bool = true)
     {
@@ -430,7 +426,6 @@ class Piwik
     /**
      * @see Piwik::checkUserHasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     static public function checkUserIsSuperUser()
     {
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index 0336e26fe76487f660cee1a8fbe034350755b5f6..87593b2ed65dfffd25f3491e0c3b60987b7e3644 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -582,7 +582,7 @@ class API extends \Piwik\Plugin\API
     {
         $this->checkAccessType($access);
         $this->checkUserExists($userLogin);
-        $this->checkUserIsNotConfigSuperUser($userLogin);
+        $this->checkUserHasNotSuperUserAccess($userLogin);
 
         if ($userLogin == 'anonymous'
             && $access == 'admin'
@@ -660,6 +660,13 @@ class API extends \Piwik\Plugin\API
         }
     }
 
+    private function checkUserHasNotSuperUserAccess($userLogin)
+    {
+        if (Piwik::hasTheUserSuperUserAccess($userLogin)) {
+            throw new Exception(Piwik::translate("UsersManager_ExceptionSuperUser"));
+        }
+    }
+
     private function checkUserIsNotConfigSuperUser($userLogin)
     {
         if ($userLogin == Piwik::getConfigSuperUserLogin()) {
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 6b26c168fad7e7fc8a43a6428ff1843676a8c05d..3ab739e7005c4b04e54e9c294d60ac3322250dc6 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -88,7 +88,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         }
 
         $superUsers = array();
-        if (Piwik::isUserHasSomeAdminAccess()) {
+        if (Piwik::hasUserSuperUserAccess()) {
             $users = APIUsersManager::getInstance()->getUsers();
             foreach ($users as $user) {
                 if ($user['superuser_access']) {
diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php
index 19e00ab38f2f30f1ef99da0421dc21f05022b658..45c703b545c769542b2a356cd7ceafafd46ba9ca 100644
--- a/tests/PHPUnit/FakeAccess.php
+++ b/tests/PHPUnit/FakeAccess.php
@@ -54,7 +54,6 @@ class FakeAccess
     /**
      * @see FakeAccess::checkUserHasSuperUserAccess()
      * @deprecated deprecated since version 2.0.4
-     * @todo To be removed from April 1st 2014.
      */
     public function checksUserIsSuperUser()
     {