diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index b37e9cc18..8993bc947 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -190,6 +190,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 				'allow_additional_accounts'   => array(true),
 				'allow_additional_identities' => array(true),
+				'popup_identity' => array(true, 'When identity is not set yet, open identity popup after login'),
 
 				'messages_per_page'           => array(20, 'Number of messages displayed on page by default'),
 				'message_read_delay'          => array(5, 'Mark message read after N seconds'),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
index 956295bcd..6dc3686eb 100755
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
@@ -50,7 +50,7 @@ class Identities extends AbstractProvider
 		// If no primary identity is found, generate default one from account info
 		if (!$primaryIdentity) {
 			$primaryIdentity = new Identity('', $account->Email());
-			$primaryIdentity->exists = false;
+			$primaryIdentity->exists = !\RainLoop\Api::Config()->Get('webmail', 'popup_identity', true);
 			$identities[] = $primaryIdentity;
 		}