diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index 500fcf0ec..093946a11 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -177,12 +177,12 @@
         <outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com" username="$user" />
     </provider>
     <provider id="ymail" label="YMail" domain="ymail.com">
-        <incoming uri="imap+tls://imap.mail.yahoo.com" username="$user" />
-        <outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com" username="$user" />
+        <incoming uri="imap+tls://imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com" username="$email" />
     </provider>
     <provider id="rocketmail" label="Rocketmail" domain="rocketmail.com">
-        <incoming uri="imap+tls://imap.mail.yahoo.com" username="$user" />
-        <outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com" username="$user" />
+        <incoming uri="imap+tls://imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com" username="$email" />
     </provider>