1 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/SignupUtils.java b/src/main/java/de/pixart/messenger/utils/SignupUtils.java
index 2c0418a19..52534b89d 100644
--- a/src/main/java/de/pixart/messenger/utils/SignupUtils.java
+++ b/src/main/java/de/pixart/messenger/utils/SignupUtils.java
@@ -12,6 +12,7 @@ import de.pixart.messenger.ui.MagicCreateActivity;
 import de.pixart.messenger.ui.ManageAccountActivity;
 import de.pixart.messenger.ui.StartConversationActivity;
 import de.pixart.messenger.ui.WelcomeActivity;
+import rocks.xmpp.addr.Jid;
 
 public class SignupUtils {
 
@@ -19,13 +20,22 @@ public class SignupUtils {
         return true;
     }
 
-    public static Intent getTokenRegistrationIntent(final Activity activity, String domain, String preAuth) {
+    public static Intent getTokenRegistrationIntent(final Activity activity, Jid jid, String preAuth) {
         final Intent intent = new Intent(activity, MagicCreateActivity.class);
-        intent.putExtra(MagicCreateActivity.EXTRA_DOMAIN, domain);
+        if (jid.isDomainJid()) {
+            intent.putExtra(MagicCreateActivity.EXTRA_DOMAIN, jid.getDomain());
+        } else {
+            intent.putExtra(MagicCreateActivity.EXTRA_DOMAIN, jid.getDomain());
+            intent.putExtra(MagicCreateActivity.EXTRA_USERNAME, jid.getEscapedLocal());
+        }
         intent.putExtra(MagicCreateActivity.EXTRA_PRE_AUTH, preAuth);
         return intent;
     }
 
+    public static Intent getSignUpIntent(Activity activity, boolean ignored) {
+        return getSignUpIntent(activity);
+    }
+
     public static Intent getSignUpIntent(final Activity activity) {
         final Intent intent = new Intent(activity, WelcomeActivity.class);
         return intent;