diff --git a/plugins/EmailRegistration/emailregister.php b/plugins/EmailRegistration/emailregister.php
index 28f69ea9e4..cda2e8cd6f 100644
--- a/plugins/EmailRegistration/emailregister.php
+++ b/plugins/EmailRegistration/emailregister.php
@@ -200,7 +200,7 @@ class EmailregisterAction extends Action
                                      '<a href="%s">password recovery</a> tool to recover a missing password.'),
                                    common_local_url('recoverpassword'));
             $this->showRegistrationForm();
-            break;
+            return;
         }
 
         $valid = false;
@@ -213,6 +213,7 @@ class EmailregisterAction extends Action
         if (!$valid) {
             $this->error = _('Not a valid email address.');
             $this->showRegistrationForm();
+            return;
         }
 
         $confirm = Confirm_address::getAddress($this->email, self::CONFIRMTYPE);