diff --git a/app/internal_packages/onboarding/lib/mailcore-provider-settings.json b/app/internal_packages/onboarding/lib/mailcore-provider-settings.json
index 3d89103e8..4898f4943 100644
--- a/app/internal_packages/onboarding/lib/mailcore-provider-settings.json
+++ b/app/internal_packages/onboarding/lib/mailcore-provider-settings.json
@@ -1070,6 +1070,9 @@
 				"ssl": true
 			}]
 		},
+		"mx-match": [
+			"mx\\.yandex\\.net(\\.)?"
+		],
 		"domain-match": [
 			"yandex\\.ru",
 			"yandex\\.ua",
diff --git a/app/internal_packages/onboarding/lib/mailspring-provider-settings.json b/app/internal_packages/onboarding/lib/mailspring-provider-settings.json
index 19f1c2098..21830dc3f 100644
--- a/app/internal_packages/onboarding/lib/mailspring-provider-settings.json
+++ b/app/internal_packages/onboarding/lib/mailspring-provider-settings.json
@@ -6428,10 +6428,10 @@
     "imap_host": "imap.yandex.ru",
     "imap_port": "993",
     "imap_security": "SSL / TLS",
-    "imap_user_format": "email-without-domain",
+    "imap_user_format": "email",
     "smtp_host": "smtp.yandex.ru",
     "smtp_port": "465",
     "smtp_security": "SSL / TLS",
-    "smtp_user_format": "email-without-domain"
+    "smtp_user_format": "email"
   }
 }
\ No newline at end of file