diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 6395a558c5..941afbd90a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -325,9 +325,12 @@ public class FragmentQuickSetup extends FragmentBase {
                         List<String> users;
                         if (provider.user == EmailProvider.UserType.LOCAL)
                             users = Arrays.asList(username, email);
-                        else if (provider.user == EmailProvider.UserType.VALUE)
-                            users = Arrays.asList(provider.username, email, username);
-                        else
+                        else if (provider.user == EmailProvider.UserType.VALUE) {
+                            String user = provider.username;
+                            if (user.startsWith("*@"))
+                                user = username + user.substring(1);
+                            users = Arrays.asList(user, email, username);
+                        } else
                             users = Arrays.asList(email, username);
                         Log.i("User type=" + provider.user +
                                 " users=" + TextUtils.join(", ", users));
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index d0eab90fdb..deb1319157 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -210,7 +210,8 @@
         name="Posteo.de"
         documentation="Please check if &lt;a href=&quot;https://posteo.de/en/help/activating-additional-email-account-protection&quot;&gt;additional email account protection&lt;/a&gt; isn't enabled."
         domain="posteo\\..*"
-        link="https://posteo.de/en/help/how-do-i-set-up-posteo-in-an-email-client-pop3-imap-and-smtp">
+        link="https://posteo.de/en/help/how-do-i-set-up-posteo-in-an-email-client-pop3-imap-and-smtp"
+        user="*@posteo.net">
         <imap
             host="posteo.de"
             port="993"