1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
index fd0e49d57..372c2bc27 100644
--- a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
@@ -81,9 +81,12 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher, Ad
         next.setOnClickListener(v -> {
             try {
                 String username = mUsername.getText().toString();
-                if (domain == null || useOwnProvider) {
+                if (domain == null && !useOwnProvider) {
                     domain = Config.MAGIC_CREATE_DOMAIN;
                 }
+                if (useOwnProvider) {
+                    domain = "your-domain.com";
+                }
                 Jid jid = Jid.of(username.toLowerCase(), domain, null);
                 if (!jid.getEscapedLocal().equals(jid.getLocal()) || username.length() < 3) {
                     mUsername.setError(getString(R.string.invalid_username));