diff --git a/actions/register.php b/actions/register.php
index aacc4fa7b4..28b122bc98 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -63,8 +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 if ($this->register_user($nickname, $password, $email)) {
-			$user = $this->register_user($nickname, $password, $email);
+		} else if ($user = $this->register_user($nickname, $password, $email)) {
 			if (!$user) {
 				$this->show_form(_('Invalid username or password.'));
 				return;