diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 84baaa8..271caa4 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.1.474")]
-[assembly: AssemblyFileVersion("3.0.1.474")]
+[assembly: AssemblyVersion("3.0.1.475")]
+[assembly: AssemblyFileVersion("3.0.1.475")]
diff --git a/Core/Settings.cs b/Core/Settings.cs
index 0388091..d1ea6d1 100644
--- a/Core/Settings.cs
+++ b/Core/Settings.cs
@@ -95,7 +95,7 @@ namespace ScrewTurn.Wiki {
 		/// Gets the Email validation Regex.
 		/// </summary>
 		public static string EmailRegex {
-			get { return @"^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})$"; }
+			get { return @"^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,5}|[0-9]{1,3})$"; }
 		}
 
 		/// <summary>
@@ -116,7 +116,6 @@ namespace ScrewTurn.Wiki {
 		/// Gets the SMTP Server validation Regex.
 		/// </summary>
 		public static string SmtpServerRegex {
-			//get { return @"^(?:[a-zA-Z0-9_\-]{1,63}\.?)+(?:[a-zA-Z]{2,})|(?=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[0-2]*[0-9]*[0-9]+\.[0-2]*[0-9]*[0-9]+\.[0-2]*[0-9]*[0-9]+\.[0-2]*[0-9]*[0-9]+$"; }
 			get { return @"^[A-Za-z0-9\.\-_]+$"; }
 		}