diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 56e064b73c..cf4a579744 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -726,7 +726,7 @@ public class FragmentAccount extends FragmentBase {
                 boolean starttls = args.getBoolean("starttls");
                 boolean insecure = args.getBoolean("insecure");
                 String port = args.getString("port");
-                String user = args.getString("user");
+                String user = args.getString("user").trim();
                 String password = args.getString("password");
                 String realm = args.getString("realm");
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 24cad82e4c..8683c949b2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -557,7 +557,7 @@ public class FragmentIdentity extends FragmentBase {
                 boolean starttls = args.getBoolean("starttls");
                 boolean insecure = args.getBoolean("insecure");
                 String port = args.getString("port");
-                String user = args.getString("user");
+                String user = args.getString("user").trim();
                 String password = args.getString("password");
                 String realm = args.getString("realm");
                 boolean use_ip = args.getBoolean("use_ip");
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 2a145f6fca..2356d92052 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -186,7 +186,7 @@ public class FragmentQuickSetup extends FragmentBase {
             @Override
             protected EmailProvider onExecute(Context context, Bundle args) throws Throwable {
                 String name = args.getString("name");
-                String email = args.getString("email");
+                String email = args.getString("email").trim();
                 String password = args.getString("password");
                 boolean check = args.getBoolean("check");