diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 58cc59f9848fe..206f187254232 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -537,7 +537,7 @@ public function setUserSettings($avatarScope,
 	) {
 
 
-		if(!$this->mailer->validateMailAddress($email)) {
+		if(!empty($email) && !$this->mailer->validateMailAddress($email)) {
 			return new DataResponse(
 				array(
 					'status' => 'error',