diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php
index c777f5e5a352e..ca4c607251236 100644
--- a/apps/dav/lib/AppInfo/Application.php
+++ b/apps/dav/lib/AppInfo/Application.php
@@ -91,6 +91,12 @@ public function registerHooks() {
 			}
 		});
 
+		$dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) {
+			$user = $event->getSubject();
+			$syncService = $this->getContainer()->query(SyncService::class);
+			$syncService->updateUser($user);
+		});
+
 		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function(GenericEvent $event) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
@@ -126,6 +132,10 @@ public function registerHooks() {
 			);
 		});
 
+		$dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) {
+			error_log("hello");
+		});
+
 		$listener = function(GenericEvent $event, $eventName) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
index 0f4a6fb3f0832..95e547bf42103 100644
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -22,80 +22,152 @@
 
 namespace OCA\DAV\CardDAV;
 
+use OC\Accounts\AccountManager;
 use OCP\IImage;
 use OCP\IUser;
+use OpenCloud\ObjectStore\Resource\Account;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Property\Text;
 
 class Converter {
 
+	/** @var AccountManager */
+	private $accountManager;
+
+	/**
+	 * Converter constructor.
+	 *
+	 * @param AccountManager $accountManager
+	 */
+	public function __construct(AccountManager $accountManager) {
+
+		$this->accountManager = $accountManager;
+
+	}
+
 	/**
 	 * @param IUser $user
-	 * @return VCard
+	 * @return VCard|null
 	 */
 	public function createCardFromUser(IUser $user) {
 
+		$userData = $this->accountManager->getUser($user);
+
 		$uid = $user->getUID();
-		$displayName = $user->getDisplayName();
-		$displayName = empty($displayName ) ? $uid : $displayName;
-		$emailAddress = $user->getEMailAddress();
 		$cloudId = $user->getCloudId();
 		$image = $this->getAvatarImage($user);
 
 		$vCard = new VCard();
 		$vCard->add(new Text($vCard, 'UID', $uid));
-		if (!empty($displayName)) {
-			$vCard->add(new Text($vCard, 'FN', $displayName));
-			$vCard->add(new Text($vCard, 'N', $this->splitFullName($displayName)));
-		}
-		if (!empty($emailAddress)) {
-			$vCard->add(new Text($vCard, 'EMAIL', $emailAddress, ['TYPE' => 'OTHER']));
+
+		$publish = false;
+
+		foreach ($userData as $property => $value) {
+			if ($value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY ||
+				$value['scope'] === AccountManager::VISIBILITY_PUBLIC
+			) {
+				$publish = true;
+				switch ($property) {
+					case AccountManager::PROPERTY_DISPLAYNAME:
+						$vCard->add(new Text($vCard, 'FN', $value['value']));
+						$vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
+						break;
+					case AccountManager::PROPERTY_AVATAR:
+						$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
+						break;
+					case AccountManager::PROPERTY_EMAIL:
+						$vCard->add(new Text($vCard, 'EMAIL', $value['value'], ['TYPE' => 'OTHER']));
+						break;
+					case AccountManager::PROPERTY_WEBSITE:
+						$vCard->add(new Text($vCard, 'URL', $value['value']));
+						break;
+					case AccountManager::PROPERTY_PHONE:
+						$vCard->add(new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']));
+						break;
+					case AccountManager::PROPERTY_ADDRESS:
+						$vCard->add(new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']));
+						break;
+				}
+			}
 		}
-		if (!empty($cloudId)) {
+
+		if ($publish && !empty($cloudId)) {
 			$vCard->add(new Text($vCard, 'CLOUD', $cloudId));
+			$vCard->validate();
+			return $vCard;
 		}
-		if ($image) {
-			$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
-		}
-		$vCard->validate();
 
-		return $vCard;
+		return null;
 	}
 
 	/**
 	 * @param VCard $vCard
 	 * @param IUser $user
-	 * @return bool
+	 * @return array
 	 */
 	public function updateCard(VCard $vCard, IUser $user) {
-		$uid = $user->getUID();
-		$displayName = $user->getDisplayName();
-		$displayName = empty($displayName ) ? $uid : $displayName;
-		$emailAddress = $user->getEMailAddress();
+
+		$userData =$this->accountManager->getUser($user);
 		$cloudId = $user->getCloudId();
 		$image = $this->getAvatarImage($user);
 
+		$publish = false;
 		$updated = false;
-		if($this->propertyNeedsUpdate($vCard, 'FN', $displayName)) {
-			$vCard->FN = new Text($vCard, 'FN', $displayName);
-			unset($vCard->N);
-			$vCard->add(new Text($vCard, 'N', $this->splitFullName($displayName)));
-			$updated = true;
-		}
-		if($this->propertyNeedsUpdate($vCard, 'EMAIL', $emailAddress)) {
-			$vCard->EMAIL = new Text($vCard, 'EMAIL', $emailAddress);
-			$updated = true;
+
+		foreach ($userData as $property => $value) {
+			if ($value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY ||
+				$value['scope'] === AccountManager::VISIBILITY_PUBLIC
+			) {
+				$publish = true;
+				switch ($property) {
+					case AccountManager::PROPERTY_DISPLAYNAME:
+						if($this->propertyNeedsUpdate($vCard, 'FN', $value['value'])) {
+							$vCard->FN = new Text($vCard, 'FN', $value['value']);
+							unset($vCard->N);
+							$vCard->add(new Text($vCard, 'N', $this->splitFullName($value['value'])));
+							$updated = true;
+						}
+						break;
+					case AccountManager::PROPERTY_AVATAR:
+						if($this->propertyNeedsUpdate($vCard, 'PHOTO', $image)) {
+							unset($vCard->PHOTO);
+							$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
+							$updated = true;
+						}
+						break;
+					case AccountManager::PROPERTY_EMAIL:
+						if($this->propertyNeedsUpdate($vCard, 'EMAIL', $value['value'])) {
+							$vCard->EMAIL = new Text($vCard, 'EMAIL', $value['value']);
+							$updated = true;
+						}
+						break;
+					case AccountManager::PROPERTY_WEBSITE:
+						if($this->propertyNeedsUpdate($vCard, 'URL', $value['value'])) {
+							$vCard->URL = new Text($vCard, 'URL', $value['value']);
+							$updated = true;
+						}
+						break;
+					case AccountManager::PROPERTY_PHONE:
+						if($this->propertyNeedsUpdate($vCard, 'URL', $value['value'])) {
+							$vCard->TEL = new Text($vCard, 'TEL', $value['value'], ['TYPE' => 'OTHER']);
+							$updated = true;
+						}
+						break;
+					case AccountManager::PROPERTY_ADDRESS:
+						if($this->propertyNeedsUpdate($vCard, 'URL', $value['value'])) {
+							$vCard->ADR = new Text($vCard, 'ADR', $value['value'], ['TYPE' => 'OTHER']);
+							$updated = true;
+						}
+						break;
+				}
+			}
 		}
+
 		if($this->propertyNeedsUpdate($vCard, 'CLOUD', $cloudId)) {
 			$vCard->CLOUD = new Text($vCard, 'CLOUD', $cloudId);
 			$updated = true;
 		}
 
-		if($this->propertyNeedsUpdate($vCard, 'PHOTO', $image)) {
-			unset($vCard->PHOTO);
-			$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
-			$updated = true;
-		}
 
 		if (empty($emailAddress) && !is_null($vCard->EMAIL)) {
 			unset($vCard->EMAIL);
@@ -110,7 +182,11 @@ public function updateCard(VCard $vCard, IUser $user) {
 			$updated = true;
 		}
 
-		return $updated;
+		if ($publish === false) {
+			$updated = false;
+		}
+
+		return [$updated, $publish];
 	}
 
 	/**
diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php
index 1ad37da6bfe4b..de113f8df49b1 100644
--- a/apps/dav/lib/CardDAV/SyncService.php
+++ b/apps/dav/lib/CardDAV/SyncService.php
@@ -24,6 +24,7 @@
 
 namespace OCA\DAV\CardDAV;
 
+use OC\Accounts\AccountManager;
 use OCP\AppFramework\Http;
 use OCP\ILogger;
 use OCP\IUser;
@@ -48,10 +49,22 @@ class SyncService {
 	/** @var array */
 	private $localSystemAddressBook;
 
-	public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger) {
+	/** @var AccountManager */
+	private $accountManager;
+
+	/**
+	 * SyncService constructor.
+	 *
+	 * @param CardDavBackend $backend
+	 * @param IUserManager $userManager
+	 * @param ILogger $logger
+	 * @param AccountManager $accountManager
+	 */
+	public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, AccountManager $accountManager) {
 		$this->backend = $backend;
 		$this->userManager = $userManager;
 		$this->logger = $logger;
+		$this->accountManager = $accountManager;
 	}
 
 	/**
@@ -215,7 +228,7 @@ private function parseMultiStatus($body) {
 	public function updateUser($user) {
 		$systemAddressBook = $this->getLocalSystemAddressBook();
 		$addressBookId = $systemAddressBook['id'];
-		$converter = new Converter();
+		$converter = new Converter($this->accountManager);
 		$name = $user->getBackendClassName();
 		$userId = $user->getUID();
 
@@ -223,11 +236,16 @@ public function updateUser($user) {
 		$card = $this->backend->getCard($addressBookId, $cardId);
 		if ($card === false) {
 			$vCard = $converter->createCardFromUser($user);
-			$this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
+			if ($vCard !== null) {
+				$this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
+			}
 		} else {
 			$vCard = Reader::read($card['carddata']);
-			if ($converter->updateCard($vCard, $user)) {
+			list($updated, $publish) = $converter->updateCard($vCard, $user);
+			if ($updated === true) {
 				$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
+			} elseif ($publish === false) {
+				$this->backend->deleteCard($addressBookId, $cardId);
 			}
 		}
 	}
diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php
index 92aa4fce7fa37..ae3c67fce1345 100644
--- a/apps/dav/lib/HookManager.php
+++ b/apps/dav/lib/HookManager.php
@@ -27,6 +27,8 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Util;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 class HookManager {
 
@@ -51,14 +53,19 @@ class HookManager {
 	/** @var array */
 	private $addressBooksToDelete;
 
+	/** @var EventDispatcher */
+	private $eventDispatcher;
+
 	public function __construct(IUserManager $userManager,
 								SyncService $syncService,
 								CalDavBackend $calDav,
-								CardDavBackend $cardDav) {
+								CardDavBackend $cardDav,
+								EventDispatcher $eventDispatcher) {
 		$this->userManager = $userManager;
 		$this->syncService = $syncService;
 		$this->calDav = $calDav;
 		$this->cardDav = $cardDav;
+		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	public function setup() {
diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
index 3decac0153aac..3e5a4357400cf 100644
--- a/lib/private/Accounts/AccountManager.php
+++ b/lib/private/Accounts/AccountManager.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Björn Schießle <bjoern@schiessle.org>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Björn Schießle
  * @license AGPL-3.0
  *
  * This code is free software: you can redistribute it and/or modify
@@ -24,6 +25,10 @@
 
 
 use OCP\IDBConnection;
+use OCP\IUser;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Class AccountManager
@@ -35,37 +40,79 @@
  */
 class AccountManager {
 
+	/** nobody can see my account details */
+	const VISIBILITY_PRIVATE = 'private';
+	/** only contacts, especially trusted servers can see my contact details */
+	const VISIBILITY_CONTACTS_ONLY = 'contacts';
+	/** every body ca see my contact detail, will be published to the lookup server */
+	const VISIBILITY_PUBLIC = 'public';
+
+	const PROPERTY_AVATAR = 'avatar';
+	const PROPERTY_DISPLAYNAME = 'displayname';
+	const PROPERTY_PHONE = 'phone';
+	const PROPERTY_EMAIL = 'email';
+	const PROPERTY_WEBSITE = 'website';
+	const PROPERTY_ADDRESS = 'address';
+
 	/** @var  IDBConnection database connection */
 	private $connection;
 
 	/** @var string table name */
 	private $table = 'accounts';
 
+	/** @var EventDispatcher */
+	private $eventDispatcher;
+
 	/**
 	 * AccountManager constructor.
 	 *
 	 * @param IDBConnection $connection
+	 * @param EventDispatcher $eventDispatcher
 	 */
-	public function __construct(IDBConnection $connection) {
+	public function __construct(IDBConnection $connection, EventDispatcher $eventDispatcher) {
 		$this->connection = $connection;
+		$this->eventDispatcher = $eventDispatcher;
+
+		$this->defaultVisibility = [
+			self::PROPERTY_ADDRESS => self::VISIBILITY_PRIVATE,
+			self::PROPERTY_PHONE => self::VISIBILITY_PRIVATE,
+			self::PROPERTY_WEBSITE => self::VISIBILITY_PRIVATE,
+			self::PROPERTY_EMAIL => self::VISIBILITY_CONTACTS_ONLY,
+			self::PROPERTY_AVATAR => self::VISIBILITY_CONTACTS_ONLY,
+			self::PROPERTY_DISPLAYNAME => self::VISIBILITY_CONTACTS_ONLY,
+		];
 	}
 
-	public function updateUser($uid, $data) {
-		$userData = $this->getUser($uid);
+	/**
+	 * update user record
+	 *
+	 * @param IUser $user
+	 * @param $data
+	 */
+	public function updateUser(IUser $user, $data) {
+		$userData = $this->getUser($user);
 		if (empty($userData)) {
-			$this->insertNewUser($uid, $data);
+			$this->insertNewUser($user, $data);
 		} else {
-			$this->updateExistingUser($uid, $data);
+			$this->updateExistingUser($user, $data);
 		}
+
+		error_log("send event");
+
+		$this->eventDispatcher->dispatch(
+			'OC\AccountManager::userUpdated',
+			new GenericEvent($user)
+		);
 	}
 
 	/**
 	 * get stored data from a given user
 	 *
-	 * @param $uid
+	 * @param IUser $user
 	 * @return array
 	 */
-	public function getUser($uid) {
+	public function getUser(IUser $user) {
+		$uid = $user->getUID();
 		$query = $this->connection->getQueryBuilder();
 		$query->select('data')->from($this->table)
 			->where($query->expr()->eq('uid', $query->createParameter('uid')))
@@ -74,7 +121,9 @@ public function getUser($uid) {
 		$result = $query->execute()->fetchAll();
 
 		if (empty($result)) {
-			return [];
+			$userData = $this->buildDefaultUserRecord($user);
+			$this->insertNewUser($user, $userData);
+			return $userData;
 		}
 
 		return json_decode($result[0]['data'], true);
@@ -83,10 +132,11 @@ public function getUser($uid) {
 	/**
 	 * add new user to accounts table
 	 *
-	 * @param string $uid
+	 * @param IUser $user
 	 * @param array $data
 	 */
-	protected function insertNewUser($uid, $data) {
+	protected function insertNewUser(IUser $user, $data) {
+		$uid = $user->getUID();
 		$jsonEncodedData = json_encode($data);
 		$query = $this->connection->getQueryBuilder();
 		$query->insert($this->table)
@@ -102,10 +152,11 @@ protected function insertNewUser($uid, $data) {
 	/**
 	 * update existing user in accounts table
 	 *
-	 * @param string $uid
+	 * @param IUser $user
 	 * @param array $data
 	 */
-	protected function updateExistingUser($uid, $data) {
+	protected function updateExistingUser(IUser $user, $data) {
+		$uid = $user->getUID();
 		$jsonEncodedData = json_encode($data);
 		$query = $this->connection->getQueryBuilder();
 		$query->update($this->table)
@@ -113,4 +164,45 @@ protected function updateExistingUser($uid, $data) {
 			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
 			->execute();
 	}
+
+	/**
+	 * build default user record in case not data set exists yet
+	 *
+	 * @param IUser $user
+	 * @return array
+	 */
+	protected function buildDefaultUserRecord(IUser $user) {
+		return [
+			self::PROPERTY_DISPLAYNAME =>
+				[
+					'value' => $user->getDisplayName(),
+					'scope' => self::VISIBILITY_CONTACTS_ONLY,
+				],
+			self::PROPERTY_ADDRESS =>
+				[
+					'value' => '',
+					'scope' => self::VISIBILITY_PRIVATE,
+				],
+			self::PROPERTY_WEBSITE =>
+				[
+					'value' => '',
+					'scope' => self::VISIBILITY_PRIVATE,
+				],
+			self::PROPERTY_EMAIL =>
+				[
+					'value' => $user->getEMailAddress(),
+					'scope' => self::VISIBILITY_CONTACTS_ONLY,
+				],
+			self::PROPERTY_AVATAR =>
+				[
+					'scope' => self::VISIBILITY_CONTACTS_ONLY
+				],
+			self::PROPERTY_PHONE =>
+				[
+					'value' => '',
+					'scope' => self::VISIBILITY_PRIVATE,
+				],
+		];
+	}
+
 }
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index e7f7a9449022d..30a877234a4f1 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -53,7 +53,7 @@ class Updater extends BasicEmitter {
 
 	/** @var ILogger $log */
 	private $log;
-	
+
 	/** @var IConfig */
 	private $config;
 
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 682f0c166e676..951f53991ec92 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -539,26 +539,26 @@ public function setUserSettings($avatarScope,
 			);
 		}
 
-		$userId = $this->userSession->getUser()->getUID();
+		$user = $this->userSession->getUser();
 
 		$data = [
-			'avatar' =>  ['scope' => $avatarScope],
-			'displayName' => ['value' => $displayname, 'scope' => $displaynameScope],
-			'email' => [['value' => $email, 'scope' => $emailScope]],
-			'website' => [['value' => $website, 'scope' => $websiteScope]],
-			'address' => [['value' => $address, 'scope' => $addressScope]],
-			'phone' => [['value' => $phone, 'scope' => $phoneScope]]
+			AccountManager::PROPERTY_AVATAR =>  ['scope' => $avatarScope],
+			AccountManager::PROPERTY_DISPLAYNAME => ['value' => $displayname, 'scope' => $displaynameScope],
+			AccountManager::PROPERTY_EMAIL=> ['value' => $email, 'scope' => $emailScope],
+			AccountManager::PROPERTY_WEBSITE => ['value' => $website, 'scope' => $websiteScope],
+			AccountManager::PROPERTY_ADDRESS => ['value' => $address, 'scope' => $addressScope],
+			AccountManager::PROPERTY_PHONE => ['value' => $phone, 'scope' => $phoneScope]
 		];
 
-		$this->accountManager->updateUser($userId, $data);
+		$this->accountManager->updateUser($user, $data);
 
 		try {
-			$this->saveUserSettings($userId, $data);
+			$this->saveUserSettings($user, $data);
 			return new DataResponse(
 				array(
 					'status' => 'success',
 					'data' => array(
-						'userId' => $userId,
+						'userId' => $user->getUID(),
 						'avatarScope' => $avatarScope,
 						'displayname' => $displayname,
 						'displaynameScope' => $displaynameScope,
@@ -588,12 +588,11 @@ public function setUserSettings($avatarScope,
 	/**
 	 * update account manager with new user data
 	 *
-	 * @param string $userId
+	 * @param IUser $user
 	 * @param array $data
 	 * @throws ForbiddenException
 	 */
-	private function saveUserSettings($userId, $data) {
-		$user = $this->userManager->get($userId);
+	private function saveUserSettings(IUser $user, $data) {
 
 		// keep the user back-end up-to-date with the latest display name and email
 		// address
@@ -611,7 +610,7 @@ private function saveUserSettings($userId, $data) {
 			}
 		}
 
-		$this->accountManager->updateUser($userId, $data);
+		$this->accountManager->updateUser($user, $data);
 	}
 
 	/**
@@ -680,12 +679,12 @@ public function setDisplayName($username, $displayName) {
 			]);
 		}
 
-		$userData = $this->accountManager->getUser($user->getUID());
-		$userData['displayName']['value'] = $displayName;
+		$userData = $this->accountManager->getUser($user);
+		$userData[AccountManager::PROPERTY_DISPLAYNAME]['value'] = $displayName;
 
 
 		try {
-			$this->saveUserSettings($username, $userData);
+			$this->saveUserSettings($user, $userData);
 			return new DataResponse([
 				'status' => 'success',
 				'data' => [
diff --git a/settings/personal.php b/settings/personal.php
index 9475b674b7503..ded834bacb4ca 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -40,7 +40,7 @@
 
 $defaults = \OC::$server->getThemingDefaults();
 $certificateManager = \OC::$server->getCertificateManager();
-$accountManager = new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection());
+$accountManager = new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher());
 $config = \OC::$server->getConfig();
 $urlGenerator = \OC::$server->getURLGenerator();
 
@@ -70,7 +70,6 @@
 $storageInfo=OC_Helper::getStorageInfo('/');
 
 $user = OC::$server->getUserManager()->get(OC_User::getUser());
-$email = $user->getEMailAddress();
 
 $userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', \OC::$server->getL10NFactory()->findLanguage() );
 $languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
@@ -156,29 +155,31 @@
 } else {
 	$totalSpace = OC_Helper::humanFileSize($storageInfo['total']);
 }
-$userData = $accountManager->getUser($user->getUID());
+
+$uid = $user->getUID();
+$userData = $accountManager->getUser($user);
 
 $tmpl->assign('total_space', $totalSpace);
 $tmpl->assign('usage_relative', $storageInfo['relative']);
 $tmpl->assign('clients', $clients);
-$tmpl->assign('email', $email);
+$tmpl->assign('email', $userData[\OC\Accounts\AccountManager::PROPERTY_EMAIL]['value']);
 $tmpl->assign('languages', $languages);
 $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()));
-$tmpl->assign('displayName', OC_User::getDisplayName());
-
-$tmpl->assign('phone', isset($userData['phone'][0]['value']) ? $userData['phone'][0]['value'] : null);
-$tmpl->assign('website', isset($userData['website'][0]['value']) ? $userData['website'][0]['value'] : null);
-$tmpl->assign('address', isset($userData['address'][0]['value']) ? $userData['address'][0]['value'] : null);
-
-$tmpl->assign('avatarScope', isset($userData['avatar']['scope']) ? $userData['avatar']['scope'] : 'contacts');
-$tmpl->assign('displayNameScope', isset($userData['displayName']['scope']) ? $userData['displayName']['scope'] : 'contacts');
-$tmpl->assign('phoneScope', isset($userData['phone'][0]['scope']) ? $userData['phone'][0]['scope'] : 'private');
-$tmpl->assign('emailScope', isset($userData['email'][0]['scope']) ? $userData['email'][0]['scope'] : 'private');
-$tmpl->assign('websiteScope', isset($userData['website'][0]['scope']) ? $userData['website'][0]['scope'] : 'private');
-$tmpl->assign('addressScope', isset($userData['address'][0]['scope']) ? $userData['address'][0]['scope'] : 'private');
+$tmpl->assign('displayName', $userData[\OC\Accounts\AccountManager::PROPERTY_DISPLAYNAME]['value']);
+
+$tmpl->assign('phone', $userData[\OC\Accounts\AccountManager::PROPERTY_PHONE]['value']);
+$tmpl->assign('website', $userData[\OC\Accounts\AccountManager::PROPERTY_WEBSITE]['value']);
+$tmpl->assign('address', $userData[\OC\Accounts\AccountManager::PROPERTY_ADDRESS]['value']);
+
+$tmpl->assign('avatarScope', $userData[\OC\Accounts\AccountManager::PROPERTY_AVATAR]['scope']);
+$tmpl->assign('displayNameScope', $userData[\OC\Accounts\AccountManager::PROPERTY_DISPLAYNAME]['scope']);
+$tmpl->assign('phoneScope', $userData[\OC\Accounts\AccountManager::PROPERTY_PHONE]['scope']);
+$tmpl->assign('emailScope', $userData[\OC\Accounts\AccountManager::PROPERTY_EMAIL]['scope']);
+$tmpl->assign('websiteScope', $userData[\OC\Accounts\AccountManager::PROPERTY_WEBSITE]['scope']);
+$tmpl->assign('addressScope', $userData[\OC\Accounts\AccountManager::PROPERTY_ADDRESS]['scope']);
 
 $tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true) === true);
 $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));