User IUser::getEMailAddress() all over the place

13 files changed, 294 insertions, 212 deletions

diff --git a/apps/encryption/lib/crypto/encryptall.php b/apps/encryption/lib/crypto/encryptall.php
index 8e97fe341b4..ef67523d7e2 100644
--- a/apps/encryption/lib/crypto/encryptall.php
+++ b/apps/encryption/lib/crypto/encryptall.php
@@ -31,6 +31,7 @@ use OCP\IL10N;
 use OCP\IUserManager;
 use OCP\Mail\IMailer;
 use OCP\Security\ISecureRandom;
+use OCP\Util;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Helper\Table;
@@ -358,14 +359,15 @@ class EncryptAll {
 		$progress = new ProgressBar($this->output, count($this->userPasswords));
 		$progress->start();
 
-		foreach ($this->userPasswords as $recipient => $password) {
+		foreach ($this->userPasswords as $uid => $password) {
 			$progress->advance();
 			if (!empty($password)) {
-				$recipientDisplayName = $this->userManager->get($recipient)->getDisplayName();
-				$to = $this->config->getUserValue($recipient, 'settings', 'email', '');
+				$recipient = $this->userManager->get($uid);
+				$recipientDisplayName = $recipient->getDisplayName();
+				$to = $recipient->getEMailAddress();
 
 				if ($to === '') {
-					$noMail[] = $recipient;
+					$noMail[] = $uid;
 					continue;
 				}
 
@@ -380,12 +382,12 @@ class EncryptAll {
 					$message->setHtmlBody($htmlBody);
 					$message->setPlainBody($textBody);
 					$message->setFrom([
-						\OCP\Util::getDefaultEmailAddress('admin-noreply')
+						Util::getDefaultEmailAddress('admin-noreply')
 					]);
 
 					$this->mailer->send($message);
 				} catch (\Exception $e) {
-					$noMail[] = $recipient;
+					$noMail[] = $uid;
 				}
 			}
 		}
diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php
index a2568425d0f..ad067b03cfd 100644
--- a/apps/provisioning_api/lib/users.php
+++ b/apps/provisioning_api/lib/users.php
@@ -199,7 +199,7 @@ class Users {
 
 		// Find the data
 		$data['quota'] = $this->fillStorageInfo($userId);
-		$data['email'] = $this->config->getUserValue($userId, 'settings', 'email');
+		$data['email'] = $targetUserObject->getEMailAddress();
 		$data['displayname'] = $targetUserObject->getDisplayName();
 
 		return new OC_OCS_Result($data);
diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php
index 63180eb3472..72c76326ac5 100644
--- a/apps/provisioning_api/tests/userstest.php
+++ b/apps/provisioning_api/tests/userstest.php
@@ -27,26 +27,27 @@
 namespace OCA\Provisioning_API\Tests;
 
 use OCA\Provisioning_API\Users;
+use OCP\API;
 use OCP\IUserManager;
 use OCP\IConfig;
-use OCP\IGroupManager;
 use OCP\IUserSession;
+use PHPUnit_Framework_MockObject_MockObject;
 use Test\TestCase as OriginalTest;
 use OCP\ILogger;
 
 class UsersTest extends OriginalTest {
 	
-	/** @var IUserManager */
+	/** @var IUserManager | PHPUnit_Framework_MockObject_MockObject */
 	protected $userManager;
-	/** @var IConfig */
+	/** @var IConfig | PHPUnit_Framework_MockObject_MockObject */
 	protected $config;
-	/** @var \OC\Group\Manager */
+	/** @var \OC\Group\Manager | PHPUnit_Framework_MockObject_MockObject */
 	protected $groupManager;
-	/** @var IUserSession */
+	/** @var IUserSession | PHPUnit_Framework_MockObject_MockObject */
 	protected $userSession;
-	/** @var ILogger */
+	/** @var ILogger | PHPUnit_Framework_MockObject_MockObject */
 	protected $logger;
-	/** @var Users */
+	/** @var Users | PHPUnit_Framework_MockObject_MockObject */
 	protected $api;
 
 	protected function tearDown() {
@@ -83,7 +84,7 @@ class UsersTest extends OriginalTest {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->getUsers());
 	}
 
@@ -203,7 +204,7 @@ class UsersTest extends OriginalTest {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->getUsers());
 	}
 
@@ -464,7 +465,7 @@ class UsersTest extends OriginalTest {
 			->with()
 			->willReturn($subAdminManager);
 
-		$expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->addUser());	
 	}
 
@@ -653,7 +654,7 @@ class UsersTest extends OriginalTest {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
 	}
 
@@ -669,7 +670,7 @@ class UsersTest extends OriginalTest {
 			->with('UserToGet')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested user could not be found');
+		$expected = new \OC_OCS_Result(null, API::RESPOND_NOT_FOUND, 'The requested user could not be found');
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
 	}
 
@@ -680,6 +681,9 @@ class UsersTest extends OriginalTest {
 			->method('getUID')
 			->will($this->returnValue('admin'));
 		$targetUser = $this->getMock('\OCP\IUser');
+		$targetUser->expects($this->once())
+			->method('getEMailAddress')
+			->willReturn('demo@owncloud.org');
 		$this->userSession
 			->expects($this->once())
 			->method('getUser')
@@ -704,11 +708,6 @@ class UsersTest extends OriginalTest {
 			->method('fillStorageInfo')
 			->with('UserToGet')
 			->will($this->returnValue(['DummyValue']));
-		$this->config
-			->expects($this->at(1))
-			->method('getUserValue')
-			->with('UserToGet', 'settings', 'email')
-			->will($this->returnValue('demo@owncloud.org'));
 		$targetUser
 			->expects($this->once())
 			->method('getDisplayName')
@@ -732,6 +731,10 @@ class UsersTest extends OriginalTest {
 			->method('getUID')
 			->will($this->returnValue('subadmin'));
 		$targetUser = $this->getMock('\OCP\IUser');
+		$targetUser
+				->expects($this->once())
+				->method('getEMailAddress')
+				->willReturn('demo@owncloud.org');
 		$this->userSession
 			->expects($this->once())
 			->method('getUser')
@@ -768,11 +771,6 @@ class UsersTest extends OriginalTest {
 			->method('fillStorageInfo')
 			->with('UserToGet')
 			->will($this->returnValue(['DummyValue']));
-		$this->config
-			->expects($this->at(1))
-			->method('getUserValue')
-			->with('UserToGet', 'settings', 'email')
-			->will($this->returnValue('demo@owncloud.org'));
 		$targetUser
 			->expects($this->once())
 			->method('getDisplayName')
@@ -823,7 +821,7 @@ class UsersTest extends OriginalTest {
 			->method('getSubAdmin')
 			->will($this->returnValue($subAdminManager));
 
-		$expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
 	}
 
@@ -865,15 +863,14 @@ class UsersTest extends OriginalTest {
 			->method('fillStorageInfo')
 			->with('subadmin')
 			->will($this->returnValue(['DummyValue']));
-		$this->config
-			->expects($this->once())
-			->method('getUserValue')
-			->with('subadmin', 'settings', 'email')
-			->will($this->returnValue('subadmin@owncloud.org'));
 		$targetUser
 			->expects($this->once())
 			->method('getDisplayName')
 			->will($this->returnValue('Subadmin User'));
+		$targetUser
+			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('subadmin@owncloud.org'));
 
 		$expected = new \OC_OCS_Result([
 			'quota' => ['DummyValue'],
@@ -889,7 +886,7 @@ class UsersTest extends OriginalTest {
 			->method('getUser')
 			->will($this->returnValue(null));
 
-		$expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+		$expected = new \OC_OCS_Result(null, API::RESPOND_UNAUTHORISED);
 		$this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit']));
 	}
 
diff --git a/core/ajax/share.php b/core/ajax/share.php
index fd42a94de6e..e9bbef172af 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -35,6 +35,8 @@
  *
  */
 
+use OCP\IUser;
+
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
@@ -135,17 +137,23 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			$itemSource = (string)$_POST['itemSource'];
 			$recipient = (string)$_POST['recipient'];
 
+			$userManager = \OC::$server->getUserManager();
+			$recipientList = [];
 			if($shareType === \OCP\Share::SHARE_TYPE_USER) {
-				$recipientList[] = $recipient;
+				$recipientList[] = $userManager->get($recipient);
 			} elseif ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
 				$recipientList = \OC_Group::usersInGroup($recipient);
+				$group = \OC::$server->getGroupManager()->get($recipient);
+				$recipientList = $group->searchUsers('');
 			}
 			// don't send a mail to the user who shared the file
-			$recipientList = array_diff($recipientList, array(\OCP\User::getUser()));
+			$recipientList = array_filter($recipientList, function($user) {
+				/** @var IUser $user */
+				return $user->getUID() !== \OCP\User::getUser();
+			});
 
 			$mailNotification = new \OC\Share\MailNotifications(
-				\OC::$server->getUserSession()->getUser()->getUID(),
-				\OC::$server->getConfig(),
+				\OC::$server->getUserSession()->getUser(),
 				\OC::$server->getL10N('lib'),
 				\OC::$server->getMailer(),
 				\OC::$server->getLogger(),
@@ -183,8 +191,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			$to_address = (string)$_POST['toaddress'];
 
 			$mailNotification = new \OC\Share\MailNotifications(
-				\OC::$server->getUserSession()->getUser()->getUID(),
-				\OC::$server->getConfig(),
+				\OC::$server->getUserSession()->getUser(),
 				\OC::$server->getL10N('lib'),
 				\OC::$server->getMailer(),
 				\OC::$server->getLogger(),
@@ -199,7 +206,6 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				} catch (Exception $e) {
 					\OCP\Util::writeLog('sharing', "Couldn't read date: " . $e->getMessage(), \OCP\Util::ERROR);
 				}
-
 			}
 
 			$result = $mailNotification->sendLinkShareMail($to_address, $file, $link, $expiration);
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index 7d983bd7e30..0cd6fcd30a4 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -218,13 +218,12 @@ class LostController extends Controller {
 			throw new \Exception($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
 		}
 
-		$email = $this->config->getUserValue($user, 'settings', 'email');
+		$userObject = $this->userManager->get($user);
+		$email = $userObject->getEMailAddress();
 
 		if (empty($email)) {
 			throw new \Exception(
-				$this->l10n->t('Couldn\'t send reset email because there is no '.
-					'email address for this username. Please ' .
-					'contact your administrator.')
+				$this->l10n->t('Could not send reset email because there is no email address for this username. Please contact your administrator.')
 			);
 		}
 
diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php
index 0d93819b9e4..2cf40c449ff 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -41,11 +41,11 @@ class OC_OCS_Cloud {
 	}
 	
 	public static function getCurrentUser() {
-		$email=\OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'settings', 'email', '');
+		$userObject = \OC::$server->getUserManager()->get(OC_User::getUser());
 		$data  = array(
-			'id' => OC_User::getUser(),
-			'display-name' => OC_User::getDisplayName(),
-			'email' => $email,
+			'id' => $userObject->getUID(),
+			'display-name' => $userObject->getDisplayName(),
+			'email' => $userObject->getEMailAddress(),
 		);
 		return new OC_OCS_Result($data);
 	}
diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index 2797e5ed99b..c7747fd38c1 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -28,11 +28,12 @@
 namespace OC\Share;
 
 use DateTime;
-use OCP\IConfig;
 use OCP\IL10N;
+use OCP\IUser;
 use OCP\Mail\IMailer;
 use OCP\ILogger;
 use OCP\Defaults;
+use OCP\Util;
 
 /**
  * Class MailNotifications
@@ -41,16 +42,14 @@ use OCP\Defaults;
  */
 class MailNotifications {
 
-	/** @var string sender userId */
-	private $userId;
+	/** @var IUser sender userId */
+	private $user;
 	/** @var string sender email address */
 	private $replyTo;
 	/** @var string */
 	private $senderDisplayName;
 	/** @var IL10N */
 	private $l;
-	/** @var IConfig */
-	private $config;
 	/** @var IMailer */
 	private $mailer;
 	/** @var Defaults */
@@ -59,34 +58,31 @@ class MailNotifications {
 	private $logger;
 
 	/**
-	 * @param string $uid user id
-	 * @param IConfig $config
+	 * @param IUser $user
 	 * @param IL10N $l10n
 	 * @param IMailer $mailer
 	 * @param ILogger $logger
 	 * @param Defaults $defaults
 	 */
-	public function __construct($uid,
-								IConfig $config,
+	public function __construct(IUser $user,
 								IL10N $l10n,
 								IMailer $mailer,
 								ILogger $logger,
 								Defaults $defaults) {
 		$this->l = $l10n;
-		$this->userId = $uid;
-		$this->config = $config;
+		$this->user = $user;
 		$this->mailer = $mailer;
 		$this->logger = $logger;
 		$this->defaults = $defaults;
 
-		$this->replyTo = $this->config->getUserValue($this->userId, 'settings', 'email', null);
-		$this->senderDisplayName = \OCP\User::getDisplayName($this->userId);
+		$this->replyTo = $this->user->getEMailAddress();
+		$this->senderDisplayName = $this->user->getDisplayName();
 	}
 
 	/**
 	 * inform users if a file was shared with them
 	 *
-	 * @param array $recipientList list of recipients
+	 * @param IUser[] $recipientList list of recipients
 	 * @param string $itemSource shared item source
 	 * @param string $itemType shared item type
 	 * @return array list of user to whom the mail send operation failed
@@ -95,8 +91,8 @@ class MailNotifications {
 		$noMail = [];
 
 		foreach ($recipientList as $recipient) {
-			$recipientDisplayName = \OCP\User::getDisplayName($recipient);
-			$to = $this->config->getUserValue($recipient, 'settings', 'email', '');
+			$recipientDisplayName = $recipient->getDisplayName();
+			$to = $recipient->getEMailAddress();
 
 			if ($to === '') {
 				$noMail[] = $recipientDisplayName;
@@ -233,4 +229,14 @@ class MailNotifications {
 		return [$htmlMail, $plainTextMail];
 	}
 
+	/**
+	 * @param $itemSource
+	 * @param $itemType
+	 * @param IUser $recipient
+	 * @return array
+	 */
+	protected function getItemSharedWithUser($itemSource, $itemType, $recipient) {
+		return Share::getItemSharedWithUser($itemType, $itemSource, $recipient->getUID());
+	}
+
 }
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index d1fa641504c..d827097ee39 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -312,7 +312,7 @@ class User implements IUser {
 	 * @since 9.0.0
 	 */
 	public function getEMailAddress() {
-		return $this->config->getUserValue($this->uid, 'settings', 'email');
+		return $this->config->getUserValue($this->uid, 'settings', 'email', null);
 	}
 
 	/**
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php
index 942319901f3..827f74c4c83 100644
--- a/settings/controller/userscontroller.php
+++ b/settings/controller/userscontroller.php
@@ -164,6 +164,10 @@ class UsersController extends Controller {
 			$subAdminGroups[$key] = $subAdminGroup->getGID();
 		}
 
+		$displayName = $user->getEMailAddress();
+		if (is_null($displayName)) {
+			$displayName = '';
+		}
 		return [
 			'name' => $user->getUID(),
 			'displayname' => $user->getDisplayName(),
@@ -173,7 +177,7 @@ class UsersController extends Controller {
 			'storageLocation' => $user->getHome(),
 			'lastLogin' => $user->getLastLogin() * 1000,
 			'backend' => $user->getBackendClassName(),
-			'email' => $this->config->getUserValue($user->getUID(), 'settings', 'email', ''),
+			'email' => $displayName,
 			'isRestoreDisabled' => !$restorePossible,
 		];
 	}
diff --git a/settings/personal.php b/settings/personal.php
index bf1e1ad8793..6c2ac351456 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -54,23 +54,24 @@ if ($config->getSystemValue('enable_avatars', true) === true) {
 }
 
 // Highlight navigation entry
-OC_App::setActiveNavigationEntry( 'personal' );
+OC::$server->getNavigationManager()->setActiveEntry('personal');
 
 $storageInfo=OC_Helper::getStorageInfo('/');
 
-$email=$config->getUserValue(OC_User::getUser(), 'settings', 'email', '');
+$user = OC::$server->getUserManager()->get(OC_User::getUser());
+$email = $user->getEMailAddress();
 
 $userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
 
 // array of common languages
-$commonlangcodes = array(
+$commonLangCodes = array(
 	'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
 );
 
 $languageNames=include 'languageCodes.php';
 $languages=array();
-$commonlanguages = array();
+$commonLanguages = array();
 foreach($languageCodes as $lang) {
 	$l = \OC::$server->getL10N('settings', $lang);
 	// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
@@ -82,12 +83,12 @@ foreach($languageCodes as $lang) {
 		$ln=array('code'=>$lang, 'name'=>$lang);
 	}
 
-	// put apropriate languages into apropriate arrays, to print them sorted
+	// put appropriate languages into appropriate arrays, to print them sorted
 	// used language -> common languages -> divider -> other languages
 	if ($lang === $userLang) {
 		$userLang = $ln;
-	} elseif (in_array($lang, $commonlangcodes)) {
-		$commonlanguages[array_search($lang, $commonlangcodes)]=$ln;
+	} elseif (in_array($lang, $commonLangCodes)) {
+		$commonLanguages[array_search($lang, $commonLangCodes)]=$ln;
 	} else {
 		$languages[]=$ln;
 	}
@@ -101,7 +102,7 @@ if (!is_array($userLang)) {
 	];
 }
 
-ksort($commonlanguages);
+ksort($commonLanguages);
 
 // sort now by displayed language not the iso-code
 usort( $languages, function ($a, $b) {
@@ -142,7 +143,7 @@ $tmpl->assign('usage_relative', $storageInfo['relative']);
 $tmpl->assign('clients', $clients);
 $tmpl->assign('email', $email);
 $tmpl->assign('languages', $languages);
-$tmpl->assign('commonlanguages', $commonlanguages);
+$tmpl->assign('commonlanguages', $commonLanguages);
 $tmpl->assign('activelanguage', $userLang);
 $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
 $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php
index 0f8cb4fc5c8..eb0447f278b 100644
--- a/tests/core/lostpassword/controller/lostcontrollertest.php
+++ b/tests/core/lostpassword/controller/lostcontrollertest.php
@@ -20,8 +20,18 @@
  */
 
 namespace OC\Core\LostPassword\Controller;
-use OC\Core\Application;
+
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\Mail\IMailer;
+use OCP\Security\ISecureRandom;
+use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * Class LostControllerTest
@@ -30,47 +40,84 @@ use OCP\AppFramework\Http\TemplateResponse;
  */
 class LostControllerTest extends \PHPUnit_Framework_TestCase {
 
-	private $container;
 	/** @var LostController */
 	private $lostController;
+	/** @var IUser */
+	private $existingUser;
+	/** @var IURLGenerator | PHPUnit_Framework_MockObject_MockObject */
+	private $urlGenerator;
+	/** @var IL10N */
+	private $l10n;
+	/** @var IUserManager | PHPUnit_Framework_MockObject_MockObject */
+	private $userManager;
+	/** @var \OC_Defaults */
+	private $defaults;
+	/** @var IConfig | PHPUnit_Framework_MockObject_MockObject */
+	private $config;
+	/** @var IMailer | PHPUnit_Framework_MockObject_MockObject */
+	private $mailer;
+	/** @var ISecureRandom | PHPUnit_Framework_MockObject_MockObject */
+	private $secureRandom;
+	/** @var ITimeFactory | PHPUnit_Framework_MockObject_MockObject */
+	private $timeFactory;
+	/** @var IRequest */
+	private $request;
 
 	protected function setUp() {
-		$app = new Application();
-		$this->container = $app->getContainer();
-		$this->container['AppName'] = 'core';
-		$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
+
+		$this->existingUser = $this->getMockBuilder('OCP\IUser')
+				->disableOriginalConstructor()->getMock();
+
+		$this->existingUser
+			->expects($this->any())
+			->method('getEMailAddress')
+			->willReturn('test@example.com');
+
+		$this->config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()->getMock();
-		$this->container['L10N'] = $this->getMockBuilder('\OCP\IL10N')
+		$this->l10n = $this->getMockBuilder('\OCP\IL10N')
 			->disableOriginalConstructor()->getMock();
-		$this->container['L10N']
+		$this->l10n
 			->expects($this->any())
 			->method('t')
 			->will($this->returnCallback(function($text, $parameters = array()) {
 				return vsprintf($text, $parameters);
 			}));
-		$this->container['Defaults'] = $this->getMockBuilder('\OC_Defaults')
+		$this->defaults = $this->getMockBuilder('\OC_Defaults')
 			->disableOriginalConstructor()->getMock();
-		$this->container['UserManager'] = $this->getMockBuilder('\OCP\IUserManager')
+		$this->userManager = $this->getMockBuilder('\OCP\IUserManager')
 			->disableOriginalConstructor()->getMock();
-		$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
+		$this->urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')
 			->disableOriginalConstructor()->getMock();
-		$this->container['URLGenerator'] = $this->getMockBuilder('\OCP\IURLGenerator')
+		$this->mailer = $this->getMockBuilder('\OCP\Mail\IMailer')
 			->disableOriginalConstructor()->getMock();
-		$this->container['Mailer'] = $this->getMockBuilder('\OCP\Mail\IMailer')
+		$this->secureRandom = $this->getMockBuilder('\OCP\Security\ISecureRandom')
 			->disableOriginalConstructor()->getMock();
-		$this->container['SecureRandom'] = $this->getMockBuilder('\OCP\Security\ISecureRandom')
+		$this->timeFactory = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory')
 			->disableOriginalConstructor()->getMock();
-		$this->container['TimeFactory'] = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory')
+		$this->request = $this->getMockBuilder('OCP\IRequest')
 			->disableOriginalConstructor()->getMock();
-		$this->container['IsEncryptionEnabled'] = true;
-		$this->lostController = $this->container['LostController'];
+		$this->lostController = new LostController(
+			'Core',
+			$this->request,
+			$this->urlGenerator,
+			$this->userManager,
+			$this->defaults,
+			$this->l10n,
+			$this->config,
+			$this->secureRandom,
+			'lostpassword-noreply@localhost',
+			true,
+			$this->mailer,
+			$this->timeFactory
+		);
 	}
 
 	public function testResetFormUnsuccessful() {
 		$userId = 'admin';
 		$token = 'MySecretToken';
 
-		$this->container['URLGenerator']
+		$this->urlGenerator
 			->expects($this->once())
 			->method('linkToRouteAbsolute')
 			->with('core.lost.setPassword', array('userId' => 'admin', 'token' => 'MySecretToken'))
@@ -89,7 +136,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	public function testEmailUnsucessful() {
 		$existingUser = 'ExistingUser';
 		$nonExistingUser = 'NonExistingUser';
-		$this->container['UserManager']
+		$this->userManager
 			->expects($this->any())
 			->method('userExists')
 			->will($this->returnValueMap(array(
@@ -106,7 +153,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->assertSame($expectedResponse, $response);
 
 		// With no mail address
-		$this->container['Config']
+		$this->config
 			->expects($this->any())
 			->method('getUserValue')
 			->with($existingUser, 'settings', 'email')
@@ -120,35 +167,35 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testEmailSuccessful() {
-		$randomToken = $this->container['SecureRandom'];
-		$this->container['SecureRandom']
+		$randomToken = $this->secureRandom;
+		$this->secureRandom
 			->expects($this->once())
 			->method('generate')
 			->with('21')
 			->will($this->returnValue('ThisIsMaybeANotSoSecretToken!'));
-		$this->container['UserManager']
-			->expects($this->once())
-			->method('userExists')
-			->with('ExistingUser')
-			->will($this->returnValue(true));
-		$this->container['TimeFactory']
+		$this->userManager
+				->expects($this->once())
+				->method('userExists')
+				->with('ExistingUser')
+				->will($this->returnValue(true));
+		$this->userManager
+				->expects($this->any())
+				->method('get')
+				->with('ExistingUser')
+				->willReturn($this->existingUser);
+		$this->timeFactory
 			->expects($this->once())
 			->method('getTime')
 			->will($this->returnValue(12348));
-		$this->container['Config']
-			->expects($this->once())
-			->method('getUserValue')
-			->with('ExistingUser', 'settings', 'email')
-			->will($this->returnValue('test@example.com'));
-		$this->container['SecureRandom']
+		$this->secureRandom
 			->expects($this->once())
 			->method('getMediumStrengthGenerator')
 			->will($this->returnValue($randomToken));
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('setUserValue')
 			->with('ExistingUser', 'owncloud', 'lostpassword', '12348:ThisIsMaybeANotSoSecretToken!');
-		$this->container['URLGenerator']
+		$this->urlGenerator
 			->expects($this->once())
 			->method('linkToRouteAbsolute')
 			->with('core.lost.resetform', array('userId' => 'ExistingUser', 'token' => 'ThisIsMaybeANotSoSecretToken!'))
@@ -171,11 +218,11 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->expects($this->at(3))
 			->method('setFrom')
 			->with(['lostpassword-noreply@localhost' => null]);
-		$this->container['Mailer']
+		$this->mailer
 			->expects($this->at(0))
 			->method('createMessage')
 			->will($this->returnValue($message));
-		$this->container['Mailer']
+		$this->mailer
 			->expects($this->at(1))
 			->method('send')
 			->with($message);
@@ -186,35 +233,35 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testEmailCantSendException() {
-		$randomToken = $this->container['SecureRandom'];
-		$this->container['SecureRandom']
+		$randomToken = $this->secureRandom;
+		$this->secureRandom
 			->expects($this->once())
 			->method('generate')
 			->with('21')
 			->will($this->returnValue('ThisIsMaybeANotSoSecretToken!'));
-		$this->container['UserManager']
+		$this->userManager
 			->expects($this->once())
 			->method('userExists')
 			->with('ExistingUser')
 			->will($this->returnValue(true));
-		$this->container['Config']
-			->expects($this->once())
-			->method('getUserValue')
-			->with('ExistingUser', 'settings', 'email')
-			->will($this->returnValue('test@example.com'));
-		$this->container['SecureRandom']
+		$this->userManager
+				->expects($this->any())
+				->method('get')
+				->with('ExistingUser')
+				->willReturn($this->existingUser);
+		$this->secureRandom
 			->expects($this->once())
 			->method('getMediumStrengthGenerator')
 			->will($this->returnValue($randomToken));
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('setUserValue')
 			->with('ExistingUser', 'owncloud', 'lostpassword', '12348:ThisIsMaybeANotSoSecretToken!');
-		$this->container['TimeFactory']
+		$this->timeFactory
 			->expects($this->once())
 			->method('getTime')
 			->will($this->returnValue(12348));
-		$this->container['URLGenerator']
+		$this->urlGenerator
 			->expects($this->once())
 			->method('linkToRouteAbsolute')
 			->with('core.lost.resetform', array('userId' => 'ExistingUser', 'token' => 'ThisIsMaybeANotSoSecretToken!'))
@@ -237,11 +284,11 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->expects($this->at(3))
 			->method('setFrom')
 			->with(['lostpassword-noreply@localhost' => null]);
-		$this->container['Mailer']
+		$this->mailer
 			->expects($this->at(0))
 			->method('createMessage')
 			->will($this->returnValue($message));
-		$this->container['Mailer']
+		$this->mailer
 			->expects($this->at(1))
 			->method('send')
 			->with($message)
@@ -253,7 +300,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testSetPasswordUnsuccessful() {
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('getUserValue')
 			->with('InvalidTokenUser', 'owncloud', 'lostpassword', null)
@@ -275,7 +322,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testSetPasswordSuccessful() {
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('getUserValue')
 			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
@@ -290,16 +337,16 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->method('setPassword')
 			->with('NewPassword')
 			->will($this->returnValue(true));
-		$this->container['UserManager']
+		$this->userManager
 			->expects($this->once())
 			->method('get')
 			->with('ValidTokenUser')
 			->will($this->returnValue($user));
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('deleteUserValue')
 			->with('ValidTokenUser', 'owncloud', 'lostpassword');
-		$this->container['TimeFactory']
+		$this->timeFactory
 			->expects($this->once())
 			->method('getTime')
 			->will($this->returnValue(12348));
@@ -310,19 +357,19 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testSetPasswordExpiredToken() {
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('getUserValue')
 			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
 			->will($this->returnValue('12345:TheOnlyAndOnlyOneTokenToResetThePassword'));
 		$user = $this->getMockBuilder('\OCP\IUser')
 			->disableOriginalConstructor()->getMock();
-		$this->container['UserManager']
+		$this->userManager
 			->expects($this->once())
 			->method('get')
 			->with('ValidTokenUser')
 			->will($this->returnValue($user));
-		$this->container['TimeFactory']
+		$this->timeFactory
 			->expects($this->once())
 			->method('getTime')
 			->will($this->returnValue(55546));
@@ -336,14 +383,14 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testSetPasswordInvalidDataInDb() {
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('getUserValue')
 			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
 			->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword'));
 		$user = $this->getMockBuilder('\OCP\IUser')
 			->disableOriginalConstructor()->getMock();
-		$this->container['UserManager']
+		$this->userManager
 			->expects($this->once())
 			->method('get')
 			->with('ValidTokenUser')
@@ -358,7 +405,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testSetPasswordExpiredTokenDueToLogin() {
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('getUserValue')
 			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
@@ -369,12 +416,12 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->expects($this->once())
 			->method('getLastLogin')
 			->will($this->returnValue(12346));
-		$this->container['UserManager']
+		$this->userManager
 			->expects($this->once())
 			->method('get')
 			->with('ValidTokenUser')
 			->will($this->returnValue($user));
-		$this->container['TimeFactory']
+		$this->timeFactory
 			->expects($this->once())
 			->method('getTime')
 			->will($this->returnValue(12345));
@@ -388,7 +435,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testIsSetPasswordWithoutTokenFailing() {
-		$this->container['Config']
+		$this->config
 			->expects($this->once())
 			->method('getUserValue')
 			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
diff --git a/tests/lib/share/MailNotificationsTest.php b/tests/lib/share/MailNotificationsTest.php
index c74fe406db1..e76550b127d 100644
--- a/tests/lib/share/MailNotificationsTest.php
+++ b/tests/lib/share/MailNotificationsTest.php
@@ -22,6 +22,7 @@
 use OC\Share\MailNotifications;
 use OCP\IConfig;
 use OCP\IL10N;
+use OCP\IUser;
 use OCP\Mail\IMailer;
 use OCP\ILogger;
 use OCP\Defaults;
@@ -30,23 +31,21 @@ use OCP\Defaults;
  * Class MailNotificationsTest
  */
 class MailNotificationsTest extends \Test\TestCase {
-	/** @var IConfig */
-	private $config;
 	/** @var IL10N */
 	private $l10n;
-	/** @var IMailer */
+	/** @var IMailer | PHPUnit_Framework_MockObject_MockObject */
 	private $mailer;
 	/** @var ILogger */
 	private $logger;
-	/** @var Defaults */
+	/** @var Defaults | PHPUnit_Framework_MockObject_MockObject */
 	private $defaults;
+	/** @var IUser | PHPUnit_Framework_MockObject_MockObject */
+	private $user;
 
 
 	public function setUp() {
 		parent::setUp();
 
-		$this->config = $this->getMockBuilder('\OCP\IConfig')
-			->disableOriginalConstructor()->getMock();
 		$this->l10n = $this->getMockBuilder('\OCP\IL10N')
 			->disableOriginalConstructor()->getMock();
 		$this->mailer = $this->getMockBuilder('\OCP\Mail\IMailer')
@@ -54,13 +53,30 @@ class MailNotificationsTest extends \Test\TestCase {
 		$this->logger = $this->getMockBuilder('\OCP\ILogger')
 			->disableOriginalConstructor()->getMock();
 		$this->defaults = $this->getMockBuilder('\OCP\Defaults')
-			->disableOriginalConstructor()->getMock();
+				->disableOriginalConstructor()->getMock();
+		$this->user = $this->getMockBuilder('\OCP\IUser')
+				->disableOriginalConstructor()->getMock();
 
 		$this->l10n->expects($this->any())
 			->method('t')
 			->will($this->returnCallback(function($text, $parameters = array()) {
 				return vsprintf($text, $parameters);
 			}));
+
+		$this->defaults
+				->expects($this->once())
+				->method('getName')
+				->will($this->returnValue('UnitTestCloud'));
+
+		$this->user
+				->expects($this->once())
+				->method('getEMailAddress')
+				->willReturn('sharer@owncloud.com');
+		$this->user
+				->expects($this->once())
+				->method('getDisplayName')
+				->willReturn('TestUser');
+
 	}
 
 	public function testSendLinkShareMailWithoutReplyTo() {
@@ -96,20 +112,8 @@ class MailNotificationsTest extends \Test\TestCase {
 			->with($message)
 			->will($this->returnValue([]));
 
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->will($this->returnValue('UnitTestCloud'));
-
-		$this->config
-			->expects($this->at(0))
-			->method('getUserValue')
-			->with('TestUser', 'settings', 'email', null)
-			->will($this->returnValue('sharer@owncloud.com'));
-
 		$mailNotifications = new MailNotifications(
-			'TestUser',
-			$this->config,
+			$this->user,
 			$this->l10n,
 			$this->mailer,
 			$this->logger,
@@ -156,20 +160,8 @@ class MailNotificationsTest extends \Test\TestCase {
 			->with($message)
 			->will($this->returnValue([]));
 
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->will($this->returnValue('UnitTestCloud'));
-
-		$this->config
-			->expects($this->at(0))
-			->method('getUserValue')
-			->with('TestUser', 'settings', 'email', null)
-			->will($this->returnValue('sharer@owncloud.com'));
-
 		$mailNotifications = new MailNotifications(
-			'TestUser',
-			$this->config,
+			$this->user,
 			$this->l10n,
 			$this->mailer,
 			$this->logger,
@@ -211,20 +203,8 @@ class MailNotificationsTest extends \Test\TestCase {
 			->with($message)
 			->will($this->throwException(new Exception('Some Exception Message')));
 
-		$this->defaults
-			->expects($this->once())
-			->method('getName')
-			->will($this->returnValue('UnitTestCloud'));
-
-		$this->config
-			->expects($this->at(0))
-			->method('getUserValue')
-			->with('TestUser', 'settings', 'email', null)
-			->will($this->returnValue('sharer@owncloud.com'));
-
 		$mailNotifications = new MailNotifications(
-			'TestUser',
-			$this->config,
+			$this->user,
 			$this->l10n,
 			$this->mailer,
 			$this->logger,
diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php
index b10737035ea..b52d6c66aad 100644
--- a/tests/settings/controller/userscontrollertest.php
+++ b/tests/settings/controller/userscontrollertest.php
@@ -14,6 +14,8 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 
 /**
+ * @group DB
+ *
  * @package OC\Settings\Controller
  */
 class UsersControllerTest extends \Test\TestCase {
@@ -60,7 +62,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$foo = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$foo
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('foo'));
 		$foo
@@ -68,6 +70,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getDisplayName')
 			->will($this->returnValue('M. Foo'));
 		$foo
+			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('foo@bar.com'));
+		$foo
 			->method('getLastLogin')
 			->will($this->returnValue(500));
 		$foo
@@ -80,7 +86,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$admin = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$admin
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('admin'));
 		$admin
@@ -89,6 +95,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->will($this->returnValue('S. Admin'));
 		$admin
 			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('admin@bar.com'));
+		$admin
+			->expects($this->once())
 			->method('getLastLogin')
 			->will($this->returnValue(12));
 		$admin
@@ -102,7 +112,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$bar = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$bar
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('bar'));
 		$bar
@@ -110,6 +120,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getDisplayName')
 			->will($this->returnValue('B. Ar'));
 		$bar
+			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('bar@dummy.com'));
+		$bar
 			->method('getLastLogin')
 			->will($this->returnValue(3999));
 		$bar
@@ -145,11 +159,11 @@ class UsersControllerTest extends \Test\TestCase {
 			->with('bar')
 			->will($this->returnValue($bar));
 		$this->container['Config']
-			->expects($this->exactly(6))
+			->expects($this->exactly(3))
 			->method('getUserValue')
-			->will($this->onConsecutiveCalls(1024, 'foo@bar.com',
-											404, 'admin@bar.com',
-											2323, 'bar@dummy.com'));
+			->will($this->onConsecutiveCalls(1024,
+											404,
+											2323));
 
 		$subadmin = $this->getMockBuilder('\OC\SubAdmin')
 			->disableOriginalConstructor()
@@ -232,7 +246,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$foo = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$foo
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('foo'));
 		$foo
@@ -240,6 +254,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getDisplayName')
 			->will($this->returnValue('M. Foo'));
 		$foo
+			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('foo@bar.com'));
+		$foo
 			->method('getLastLogin')
 			->will($this->returnValue(500));
 		$foo
@@ -252,7 +270,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$admin = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$admin
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('admin'));
 		$admin
@@ -261,6 +279,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->will($this->returnValue('S. Admin'));
 		$admin
 			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('admin@bar.com'));
+		$admin
+			->expects($this->once())
 			->method('getLastLogin')
 			->will($this->returnValue(12));
 		$admin
@@ -274,7 +296,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$bar = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$bar
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('bar'));
 		$bar
@@ -282,6 +304,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getDisplayName')
 			->will($this->returnValue('B. Ar'));
 		$bar
+			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('bar@dummy.com'));
+		$bar
 			->method('getLastLogin')
 			->will($this->returnValue(3999));
 		$bar
@@ -326,12 +352,12 @@ class UsersControllerTest extends \Test\TestCase {
 			->with('admin')
 			->will($this->returnValue($admin));
 		$this->container['Config']
-			->expects($this->exactly(6))
+			->expects($this->exactly(3))
 			->method('getUserValue')
 			->will($this->onConsecutiveCalls(
-				2323, 'bar@dummy.com',
-				1024, 'foo@bar.com',
-				404, 'admin@bar.com'
+				2323,
+				1024,
+				404
 			));
 
 		$subgroup1 = $this->getMockBuilder('\OCP\IGroup')
@@ -417,7 +443,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$foo = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$foo
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('foo'));
 		$foo
@@ -425,6 +451,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getDisplayName')
 			->will($this->returnValue('M. Foo'));
 		$foo
+			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('foo@bar.com'));
+		$foo
 			->method('getLastLogin')
 			->will($this->returnValue(500));
 		$foo
@@ -437,7 +467,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$admin = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$admin
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('admin'));
 		$admin
@@ -446,6 +476,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->will($this->returnValue('S. Admin'));
 		$admin
 			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('admin@bar.com'));
+		$admin
+			->expects($this->once())
 			->method('getLastLogin')
 			->will($this->returnValue(12));
 		$admin
@@ -459,7 +493,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$bar = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$bar
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('bar'));
 		$bar
@@ -467,6 +501,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getDisplayName')
 			->will($this->returnValue('B. Ar'));
 		$bar
+			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue('bar@dummy.com'));
+		$bar
 			->method('getLastLogin')
 			->will($this->returnValue(3999));
 		$bar
@@ -487,11 +525,9 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getUserGroupIds')
 			->will($this->onConsecutiveCalls(array('Users', 'Support'), array('admins', 'Support'), array('External Users')));
 		$this->container['Config']
-			->expects($this->exactly(6))
+			->expects($this->exactly(3))
 			->method('getUserValue')
-			->will($this->onConsecutiveCalls(1024, 'foo@bar.com',
-				404, 'admin@bar.com',
-				2323, 'bar@dummy.com'));
+			->will($this->onConsecutiveCalls(1024, 404, 2323));
 
 		$subadmin = $this->getMockBuilder('\OC\SubAdmin')
 			->disableOriginalConstructor()
@@ -554,7 +590,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$user = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$user
-			->expects($this->exactly(3))
+			->expects($this->exactly(2))
 			->method('getUID')
 			->will($this->returnValue('foo'));
 		$user
@@ -562,6 +598,10 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getDisplayName')
 			->will($this->returnValue('M. Foo'));
 		$user
+			->expects($this->once())
+			->method('getEMailAddress')
+			->will($this->returnValue(null));
+		$user
 			->method('getLastLogin')
 			->will($this->returnValue(500));
 		$user