diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 89fc980fe..32836fe9f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -5,6 +5,7 @@
  - fixed: Clicking on Widget gear causes user to jump to another part of the page.
  - fixed: Manage Subscription Code Batches: Names of Batches not Displayed
  - fixed: Manage Subscription Codes: No way to Select
+ - fixed: Self registration that does not require passwords, now allows multiple users with empty passwords.  This means that users can self register without a password and might cause downstream bugs with other wobjects.
 
 7.5.17
  - fixed: Payment Methods Hover Help Incomplete
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 73d29c9da..4b348fa4d 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -7,6 +7,11 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+7.5.17
+--------------------------------------------------------------------
+ * If users are allowed to self register and emails are not required, this
+   might cause downstream bugs in other assets that require email addresses.
+
 7.5.16
 --------------------------------------------------------------------
  * You need the following Perl Modules installed before you upgrade:
diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm
index c9dc731be..901f50e9f 100644
--- a/lib/WebGUI/Operation/Profile.pm
+++ b/lib/WebGUI/Operation/Profile.pm
@@ -170,7 +170,7 @@ sub validateProfileData {
 		}
 		if ($field->isRequired && $data{$field->getId} eq "") {
 			$error .= '<li>'.$field->getLabel.' '.$i18n->get(451).'</li>';
-		} elsif ($field->getId eq "email" && isDuplicateEmail($session,$data{$field->getId})) {
+		} elsif ($field->getId eq "email" && isDuplicateEmail($session,$data{$field->getId}) && WebGUI::ProfileField->new($session, "email")->isRequired() ) {
 			$warning .= '<li>'.$i18n->get(1072).'</li>';
 		}
 		if ($field->getId eq "language" && $fieldValue ne "") {