diff --git a/application/core/Plugins/PluginManager.php b/application/core/Plugins/PluginManager.php
index a2e3828a..06b6a009 100644
--- a/application/core/Plugins/PluginManager.php
+++ b/application/core/Plugins/PluginManager.php
@@ -36,8 +36,6 @@ class PluginManager {
 
 		$this->pluginMenu = new PluginMenu($maniaControl);
 		$this->maniaControl->configurator->addMenu($this->pluginMenu);
-
-		$this->preparePlugins();
 	}
 
 	/**
@@ -198,6 +196,9 @@ class PluginManager {
 			$classesAfter = get_declared_classes();
 			$newClasses   = array_diff($classesAfter, $classesBefore);
 			foreach($newClasses as $className) {
+				//Prepare Plugin
+				$className::prepare($this->maniaControl);
+
 				if (!$this->isPluginClass($className)) {
 					continue;
 				}
@@ -226,15 +227,6 @@ class PluginManager {
 		return null;
 	}
 
-	/**
-	 * Prepare all Plugins
-	 */
-	private function preparePlugins() {
-		foreach($this->pluginClasses as $plugin) {
-			$plugin::prepare($this->maniaControl);
-		}
-	}
-
 	/**
 	 * Get all declared plugin class names
 	 *