diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index 1322697d4..30b91b9f4 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -208,13 +208,6 @@ class PluginManager
      */
     public function registerPlugin($plugin, $pluginId = null)
     {
-        /**
-         * Verify that the provided plugin should be registered
-         */
-        if (!$plugin || $plugin->disabled || (self::$noInit && !$plugin->elevated)) {
-            return;
-        }
-
         if (!$pluginId) {
             $pluginId = $this->getIdentifier($plugin);
         }
@@ -230,6 +223,13 @@ class PluginManager
             Lang::addNamespace($pluginNamespace, $langPath);
         }
 
+        /**
+         * Verify that the provided plugin should be registered
+         */
+        if (!$plugin || $plugin->disabled || (self::$noInit && !$plugin->elevated)) {
+            return;
+        }
+
         /*
          * Register plugin class autoloaders
          */