diff --git a/gajim/gtk/account_wizard.py b/gajim/gtk/account_wizard.py
index 2269bd5a3de0f64409e1190aacf4db0be23c3b28..e03905621534d8847adbdeadca8081547791fbd5 100644
--- a/gajim/gtk/account_wizard.py
+++ b/gajim/gtk/account_wizard.py
@@ -293,7 +293,6 @@ class AccountCreationWizard:
                     100, self.update_progressbar)
                 # Get form from serveur
                 con = connection.Connection(self.account)
-                app.plugin_manager.register_modules_for_account(con)
                 app.connections[self.account] = con
                 con.new_account(self.account, config)
         elif cur_page == 3:
@@ -458,6 +457,10 @@ class AccountCreationWizard:
         self.create_vars(obj.account_info)
         self.show_finish_page()
 
+        # Register plugin modules after successful registration
+        # Some plugins need the registered JID to function properly
+        app.plugin_manager.register_modules_for_account(obj.conn)
+
         if self.update_progressbar_timeout_id is not None:
             GLib.source_remove(self.update_progressbar_timeout_id)