diff --git a/actions/register.php b/actions/register.php
index 37e787c9d0..aacc4fa7b4 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -63,7 +63,7 @@ class RegisterAction extends Action {
 			$this->show_form(_('Email address already exists.'));
 		} else if ($password != $confirm) {
 			$this->show_form(_('Passwords don\'t match.'));
-		} else {
+		} else if ($this->register_user($nickname, $password, $email)) {
 			$user = $this->register_user($nickname, $password, $email);
 			if (!$user) {
 				$this->show_form(_('Invalid username or password.'));