diff --git a/dev/Styles/OpenPgpKey.less b/dev/Styles/OpenPgpKey.less
index b9ff7a9f2..82efbcb69 100644
--- a/dev/Styles/OpenPgpKey.less
+++ b/dev/Styles/OpenPgpKey.less
@@ -116,3 +116,17 @@
 		}
 	}
 }
+
+.popups {
+	.b-open-pgp-key-add-content {
+		&.modal {
+
+			width: 645px;
+
+			.inputKey {
+				width: 600px;
+
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index 7ef050381..af540262f 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -1506,19 +1506,20 @@ class PdoAddressBook
 
 								foreach ($aItems as $sEmail)
 								{
-									if ($bName)
+									if ($sEmail)
 									{
-										$aResult[] = array($sEmail, $sNameItem);
-									}
-
-									if ($bNick)
-									{
-										$aResult[] = array($sEmail, $sNickItem);
-									}
-
-									if (!$bName && !$bNick)
-									{
-										$aResult[] = array($sEmail, '');
+										if ($bName)
+										{
+											$aResult[] = array($sEmail, $sNameItem);
+										}
+										else if ($bNick)
+										{
+											$aResult[] = array($sEmail, $sNickItem);
+										}
+										else
+										{
+											$aResult[] = array($sEmail, '');
+										}
 									}
 								}
 							}