1 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index b54959316..d0f5f8542 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -356,13 +356,21 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
         final Jid jid = mAccount == null ? null : mAccount.getJid();
 
         if (SignupUtils.isSupportTokenRegistry() && jid != null && magicCreate && !jid.getDomain().equals(Config.MAGIC_CREATE_DOMAIN)) {
-            final Intent intent = SignupUtils.getTokenRegistrationIntent(this, jid.getDomain(), mAccount.getKey(Account.PRE_AUTH_REGISTRATION_TOKEN));
+            final Jid preset;
+            if (mAccount.isOptionSet(Account.OPTION_FIXED_USERNAME)) {
+                preset = jid.asBareJid();
+            } else {
+                preset = Jid.ofDomain(jid.getDomain());
+            }
+            final Intent intent = SignupUtils.getTokenRegistrationIntent(this, preset, mAccount.getKey(Account.PRE_AUTH_REGISTRATION_TOKEN));
+            StartConversationActivity.addInviteUri(intent, getIntent());
             startActivity(intent);
             return;
         }
 
         if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) {
-            Intent intent = SignupUtils.getSignUpIntent(this);
+            Intent intent = SignupUtils.getSignUpIntent(this, mForceRegister != null && mForceRegister);
+            StartConversationActivity.addInviteUri(intent, getIntent());
             startActivity(intent);
             overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
         }
@@ -1155,7 +1163,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
 
         }
 
-        final boolean editable = !mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY) && QuickConversationsService.isConversations();
+        final boolean editable = !mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY) && !mAccount.isOptionSet(Account.OPTION_FIXED_USERNAME) && QuickConversationsService.isConversations();
         this.binding.accountJid.setEnabled(editable);
         this.binding.accountJid.setFocusable(editable);
         this.binding.accountJid.setFocusableInTouchMode(editable);