diff --git a/src/main/java/meteordevelopment/meteorclient/MeteorClient.java b/src/main/java/meteordevelopment/meteorclient/MeteorClient.java
index 46f64dd540..e6704a22d0 100644
--- a/src/main/java/meteordevelopment/meteorclient/MeteorClient.java
+++ b/src/main/java/meteordevelopment/meteorclient/MeteorClient.java
@@ -97,7 +97,6 @@ public void onInitializeClient() {
         AddonManager.init();
 
         // Register event handlers
-        EVENT_BUS.registerLambdaFactory(ADDON.getPackage() , (lookupInMethod, klass) -> (MethodHandles.Lookup) lookupInMethod.invoke(null, klass, MethodHandles.lookup()));
         AddonManager.ADDONS.forEach(addon -> {
             try {
                 EVENT_BUS.registerLambdaFactory(addon.getPackage(), (lookupInMethod, klass) -> (MethodHandles.Lookup) lookupInMethod.invoke(null, klass, MethodHandles.lookup()));
diff --git a/src/main/java/meteordevelopment/meteorclient/addons/AddonManager.java b/src/main/java/meteordevelopment/meteorclient/addons/AddonManager.java
index 1678f86d59..54af1c4d00 100644
--- a/src/main/java/meteordevelopment/meteorclient/addons/AddonManager.java
+++ b/src/main/java/meteordevelopment/meteorclient/addons/AddonManager.java
@@ -58,6 +58,8 @@ public String getCommit() {
             for (Person author : metadata.getAuthors()) {
                 MeteorClient.ADDON.authors[i++] = author.getName();
             }
+
+            ADDONS.add(MeteorClient.ADDON);
         }
 
         // Addons
diff --git a/src/main/java/meteordevelopment/meteorclient/gui/screens/ModuleScreen.java b/src/main/java/meteordevelopment/meteorclient/gui/screens/ModuleScreen.java
index d106a5604d..e3a5d95ad2 100644
--- a/src/main/java/meteordevelopment/meteorclient/gui/screens/ModuleScreen.java
+++ b/src/main/java/meteordevelopment/meteorclient/gui/screens/ModuleScreen.java
@@ -5,6 +5,7 @@
 
 package meteordevelopment.meteorclient.gui.screens;
 
+import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.events.meteor.ActiveModulesChangedEvent;
 import meteordevelopment.meteorclient.events.meteor.ModuleBindChangedEvent;
 import meteordevelopment.meteorclient.gui.GuiTheme;
@@ -93,12 +94,17 @@ public void initWidgets() {
         // Bottom
         WHorizontalList bottom = add(theme.horizontalList()).expandX().widget();
 
-        //   Active
+        // Active
         bottom.add(theme.label("Active: "));
         active = bottom.add(theme.checkbox(module.isActive())).expandCellX().widget();
         active.action = () -> {
             if (module.isActive() != active.checked) module.toggle();
         };
+
+        if (module.addon != null && module.addon != MeteorClient.ADDON) {
+            bottom.add(theme.label("From: ")).right().widget();
+            bottom.add(theme.label(module.addon.name).color(theme.textSecondaryColor())).right().widget();
+        }
     }
 
     @Override
diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/Module.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/Module.java
index 2b20b44d57..1f1a77f290 100644
--- a/src/main/java/meteordevelopment/meteorclient/systems/modules/Module.java
+++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/Module.java
@@ -6,6 +6,8 @@
 package meteordevelopment.meteorclient.systems.modules;
 
 import meteordevelopment.meteorclient.MeteorClient;
+import meteordevelopment.meteorclient.addons.AddonManager;
+import meteordevelopment.meteorclient.addons.MeteorAddon;
 import meteordevelopment.meteorclient.gui.GuiTheme;
 import meteordevelopment.meteorclient.gui.widgets.WWidget;
 import meteordevelopment.meteorclient.settings.Settings;
@@ -33,6 +35,7 @@ public abstract class Module implements ISerializable<Module>, Comparable<Module
     public final String description;
     public final Color color;
 
+    public final MeteorAddon addon;
     public final Settings settings = new Settings();
 
     private boolean active;
@@ -53,6 +56,16 @@ public Module(Category category, String name, String description) {
         this.title = Utils.nameToTitle(name);
         this.description = description;
         this.color = Color.fromHsv(Utils.random(0.0, 360.0), 0.35, 1);
+
+        String classname = this.getClass().getName();
+        for (MeteorAddon addon : AddonManager.ADDONS) {
+            if (classname.startsWith(addon.getPackage())) {
+                this.addon = addon;
+                return;
+            }
+        }
+
+        this.addon = null;
     }
 
     public WWidget getWidget(GuiTheme theme) {
diff --git a/src/main/java/meteordevelopment/meteorclient/utils/ReflectInit.java b/src/main/java/meteordevelopment/meteorclient/utils/ReflectInit.java
index 402264a9ba..ac4ca4cd06 100644
--- a/src/main/java/meteordevelopment/meteorclient/utils/ReflectInit.java
+++ b/src/main/java/meteordevelopment/meteorclient/utils/ReflectInit.java
@@ -5,7 +5,6 @@
 
 package meteordevelopment.meteorclient.utils;
 
-import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.addons.AddonManager;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
 import org.reflections.Reflections;
@@ -24,8 +23,6 @@ private ReflectInit() {
     }
 
     public static void registerPackages() {
-        add(MeteorClient.ADDON);
-
         for (MeteorAddon addon : AddonManager.ADDONS) {
             try {
                 add(addon);
diff --git a/src/main/java/meteordevelopment/meteorclient/utils/player/TitleScreenCredits.java b/src/main/java/meteordevelopment/meteorclient/utils/player/TitleScreenCredits.java
index 96aafa97fb..67881268c1 100644
--- a/src/main/java/meteordevelopment/meteorclient/utils/player/TitleScreenCredits.java
+++ b/src/main/java/meteordevelopment/meteorclient/utils/player/TitleScreenCredits.java
@@ -36,7 +36,6 @@ private TitleScreenCredits() {
 
     private static void init() {
         // Add addons
-        add(MeteorClient.ADDON);
         for (MeteorAddon addon : AddonManager.ADDONS) add(addon);
 
         // Sort by width (Meteor always first)