diff --git a/core/Command/User/Setting.php b/core/Command/User/Setting.php
index 368a0c15dcde5184b7ee44ced9213b61500905a1..d7bb436783f52cdeff37beb714d915e0f6dac1d0 100644
--- a/core/Command/User/Setting.php
+++ b/core/Command/User/Setting.php
@@ -25,6 +25,7 @@ namespace OC\Core\Command\User;
 use OC\Core\Command\Base;
 use OCP\IConfig;
 use OCP\IDBConnection;
+use OCP\IUser;
 use OCP\IUserManager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -174,6 +175,14 @@ class Setting extends Base {
 					return 1;
 				}
 
+				if ($app === 'settings' && $key === 'email') {
+					$user = $this->userManager->get($uid);
+					if ($user instanceof IUser) {
+						$user->setEMailAddress($input->getArgument('value'));
+						return 0;
+					}
+				}
+
 				$this->config->setUserValue($uid, $app, $key, $input->getArgument('value'));
 				return 0;
 
@@ -183,6 +192,14 @@ class Setting extends Base {
 					return 1;
 				}
 
+				if ($app === 'settings' && $key === 'email') {
+					$user = $this->userManager->get($uid);
+					if ($user instanceof IUser) {
+						$user->setEMailAddress('');
+						return 0;
+					}
+				}
+
 				$this->config->deleteUserValue($uid, $app, $key);
 				return 0;