diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index fe9894e52b..02d8fff981 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -342,8 +342,8 @@ class FinishopenidloginAction extends Action {
 										  'max_length' => 64,
 										  'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
 			return false;
-		}
-		if (!User::allowed_nickname($str)) {
+		}	
+	if (!User::allowed_nickname($str)) {
 			return false;
 		}
 		if (User::staticGet('nickname', $str)) {
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index b6e24c7299..e98c849351 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -90,6 +90,7 @@ class ProfilesettingsAction extends SettingsAction {
 			return;
 		} else if (!User::allowed_nickname($nickname)) {
 			$this->show_form(_t('Not a valid nickname.'));
+			return;
 		} else if (!is_null($homepage) && (strlen($homepage) > 0) &&
 				   !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
 			$this->show_form(_t('Homepage is not a valid URL.'));