diff --git a/Bonobo.Git.Server/Attributes/EmailAttribute.cs b/Bonobo.Git.Server/Attributes/EmailAttribute.cs
deleted file mode 100644
index 58d7d7ddc..000000000
--- a/Bonobo.Git.Server/Attributes/EmailAttribute.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.ComponentModel.DataAnnotations;
-
-namespace Bonobo.Git.Server
-{
-    public class EmailAttribute : RegularExpressionAttribute
-    {        
-        public EmailAttribute() :
-            base(@"^(([A-Za-z0-9]+_+)|([A-Za-z0-9]+\-+)|([A-Za-z0-9]+\.+)|([A-Za-z0-9]+\++))*[A-Za-z0-9]+@((\w+\-+)|(\w+\.))*\w{1,63}\.[a-zA-Z]{2,63}$") 
-        { 
-        }
-    }
-}
diff --git a/Bonobo.Git.Server/Bonobo.Git.Server.csproj b/Bonobo.Git.Server/Bonobo.Git.Server.csproj
index ff55b58b6..90a2ec006 100644
--- a/Bonobo.Git.Server/Bonobo.Git.Server.csproj
+++ b/Bonobo.Git.Server/Bonobo.Git.Server.csproj
@@ -378,7 +378,6 @@
     <Compile Include="Data\EFTeamRepository.cs" />
     <Compile Include="Data\IRepositoryRepository.cs" />
     <Compile Include="Data\ITeamRepository.cs" />
-    <Compile Include="Attributes\EmailAttribute.cs" />
     <Compile Include="Extensions\TypeExtensions.cs" />
     <Compile Include="FileActionResult.cs" />
     <Compile Include="Attributes\FileNameAttribute.cs" />
diff --git a/Bonobo.Git.Server/Models/AccountModels.cs b/Bonobo.Git.Server/Models/AccountModels.cs
index 86d505443..ddbcffde3 100644
--- a/Bonobo.Git.Server/Models/AccountModels.cs
+++ b/Bonobo.Git.Server/Models/AccountModels.cs
@@ -92,7 +92,7 @@ public class UserEditModel
         public string Surname { get; set; }
 
         [Required(ErrorMessageResourceType = typeof(Resources), ErrorMessageResourceName = "Validation_Required")]
-        [Email(ErrorMessageResourceType = typeof(Resources), ErrorMessageResourceName = "Validation_Email")]
+        [EmailAddress(ErrorMessageResourceType = typeof(Resources), ErrorMessageResourceName = "Validation_Email")]
         [DataType(DataType.EmailAddress)]
         [Display(ResourceType = typeof(Resources), Name = "Account_Edit_Email")]
         public string Email { get; set; }
@@ -162,7 +162,7 @@ public class UserCreateModel
 
         [Required(ErrorMessageResourceType = typeof(Resources), ErrorMessageResourceName = "Validation_Required")]
         [StringLength(50, ErrorMessageResourceType = typeof(Resources), ErrorMessageResourceName = "Validation_StringLength")]
-        [Email(ErrorMessageResourceType = typeof(Resources), ErrorMessageResourceName = "Validation_Email")]
+        [EmailAddress(ErrorMessageResourceType = typeof(Resources), ErrorMessageResourceName = "Validation_Email")]
         [DataType(DataType.EmailAddress)]
         [Display(ResourceType = typeof(Resources), Name = "Account_Create_Email")]
         public string Email { get; set; }