diff --git a/checkin_notes b/checkin_notes
index 7aba836c44..86394232ce 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -25342,3 +25342,10 @@ David  25 Feb 2005
 
     client/
         cs_files.C
+
+David  25 Feb 2005
+    - allow only one account per email address,
+        including munged email addresses (from Bruce Allen)
+
+    html/user/
+        create_account_action.php
diff --git a/html/user/create_account_action.php b/html/user/create_account_action.php
index ad2c74d6c0..2d60cc7e2f 100644
--- a/html/user/create_account_action.php
+++ b/html/user/create_account_action.php
@@ -5,7 +5,7 @@ include_once("../inc/util.inc");
 include_once("../inc/email.inc");
 
 function show_error($str) {
-    page_head("Create account: error");
+    page_head("Can't create account");
     echo "$str<br>\n";
     echo mysql_error();
     echo "<p>Click your browser's <b>Back</b> button to try again.\n<p>\n";
@@ -58,7 +58,7 @@ if (!is_valid_email_addr($new_email_addr)) {
         name@domain"
     );
 }
-$query = "select * from user where email_addr='$new_email_addr'";
+$query = "select * from user where email_addr='$new_email_addr' or email_addr like '@$new_email_addr_%' limit 1";
 $result = mysql_query($query);
 if ($result) {
     $user = mysql_fetch_object($result);