diff --git a/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs b/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
index cea0c7fe4..37a82affd 100644
--- a/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
+++ b/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
@@ -205,7 +205,8 @@ namespace Orchard.Tests.Modules.Users.Controllers {
                 @"Ima.Fool@example.com",
                 @"""Ima.Fool""@example.com",
                 @"""Ima Fool""@example.com",
-                "2xxx1414@i.ua"
+                "2xxx1414@i.ua",
+                "Dreißig-öffentliche-Ämter-in-Übersee@Beispiel.de"
                 )]
             string email)
         {
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs b/src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
index 150c43b9b..e0c337930 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
@@ -6,7 +6,7 @@ using Orchard.Security;
 namespace Orchard.Users.Models {
     public sealed class UserPart : ContentPart<UserPartRecord>, IUser {
         public const string EmailPattern =
-            @"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
+            @"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-\p{L}0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
             + @"@([a-z0-9][\w-]*\.)+[a-z]{2,}$";
 
         public const int MaxUserNameLength = 255;