diff --git a/dev/Styles/Admin/Packages.less b/dev/Styles/Admin/Packages.less
index b45934782..50b17d72a 100644
--- a/dev/Styles/Admin/Packages.less
+++ b/dev/Styles/Admin/Packages.less
@@ -33,6 +33,7 @@
 	td + td {
 		text-align: center;
 		vertical-align: middle;
+		white-space: nowrap;
 	}
 
 	a {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
index 108796133..5b26125fc 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
@@ -241,7 +241,7 @@ trait Contacts
 
 	public function setContactsSyncData(\RainLoop\Model\Account $oAccount, array $aData) : bool
 	{
-		$oMainAccount = $this->getAccountFromToken();
+		$oMainAccount = $this->getMainAccountFromToken();
 		if ($aData['Password']) {
 			$aData['Password'] = \SnappyMail\Crypt::EncryptToJSON($aData['Password'], $oMainAccount->CryptKey());
 		}
@@ -264,7 +264,7 @@ trait Contacts
 			$aData = \json_decode($sData);
 			if ($aData) {
 				if ($aData['Password']) {
-					$oMainAccount = $this->getAccountFromToken();
+					$oMainAccount = $this->getMainAccountFromToken();
 					// Verify oAccount password hasn't changed so that Password can be decrypted
 					if ($aData['PasswordHMAC'] !== \hash_hmac('sha1', $aData['Password'], $oMainAccount->CryptKey())) {
 						// Failed