diff --git a/checkin_notes b/checkin_notes
index 19a2a57369..c2ec9e60a4 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -11193,3 +11193,10 @@ David  18 Oct 2006
 
     clientgui/
         ViewResources.cpp,h
+
+Rom    18 Oct 2006
+    - Bug Fix: Change the regex that validates email addresses in the manager to a 5 star rated
+        expression. See http://regexlib.com/REDetails.aspx?regexp_id=328
+        
+    clientgui/
+        ValidateEmailAddress.cpp
diff --git a/clientgui/ValidateEmailAddress.cpp b/clientgui/ValidateEmailAddress.cpp
index e83054848b..c17de04f1a 100644
--- a/clientgui/ValidateEmailAddress.cpp
+++ b/clientgui/ValidateEmailAddress.cpp
@@ -65,13 +65,15 @@ bool CValidateEmailAddress::Validate(wxWindow *parent) {
     wxString val(control->GetValue().Trim().Trim(false));  // trim spaces before and after
 
     // Regular Expression found here:
-    //   http://www.regexlib.com/REDetails.aspx?regexp_id=284
+    //   http://www.regexlib.com/REDetails.aspx?regexp_id=328
     wxRegEx reEmail(
-        wxT("^([a-zA-Z0-9_\\-])+(\\.([a-zA-Z0-9_\\-])+)*@((\\[(((([0-1])?([0-9])?[0-9])|"
-            "(2[0-4][0-9])|(2[0-5][0-5])))\\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2["
-            "0-5][0-5])))\\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\\.(("
-            "(([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5]))\\]))|((([a-zA-Z0-9])+("
-            "([\\-])+([a-zA-Z0-9])+)*\\.)+([a-zA-Z])+(([\\-])+([a-zA-Z0-9])+)*))$"));
+        wxT("^((\\\"[^\\\"\\f\\n\\r\\t\\v\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\"
+            "}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4]["
+            "0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2["
+            "0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25["
+            "0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\."
+            "((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]"
+            ")))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$"));
 
     if (val.Length() == 0) {
         ok = FALSE;
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 3c9b74d0a1..a56280d573 100644
Binary files a/win_build/installerv2/BOINC.ism and b/win_build/installerv2/BOINC.ism differ