diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index e81d14f36..15e03e15c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -116,7 +116,7 @@ class Account implements \JsonSerializable
 
 	public function PasswordHash() : string
 	{
-		return \sha1($this->IncPassword() + APP_SALT, true);
+		return \sha1($this->IncPassword() ?: APP_SALT, true);
 	}
 
 	public function ClientCert() : string