diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
index 2805c5222..a004353c7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@@ -37,8 +37,6 @@ trait User
 		$sEmail = \MailSo\Base\Utils::Trim($this->GetActionParam('Email', ''));
 		$sPassword = $this->GetActionParam('Password', '');
 
-		$this->logMask($sPassword);
-
 		try {
 			$oAccount = $this->LoginProcess($sEmail, $sPassword);
 		} catch (\Throwable $oException) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index 4ebf93fc3..2895f7709 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -124,6 +124,8 @@ trait UserAuth
 	{
 		$sInputEmail = $sEmail;
 
+		$this->logMask($sPassword);
+
 		$sLogin = '';
 		$this->resolveLoginCredentials($sEmail, $sPassword, $sLogin);
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index 8272808e3..b868f6519 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -126,11 +126,11 @@ class ServiceActions
 					case 'DoLogin':
 					case 'DoAdminLogin':
 					case 'DoAccountAdd':
-						$this->Logger()->AddSecret($this->oActions->GetActionParam('Password', ''));
+						$this->oActions->logMask($this->oActions->GetActionParam('Password', ''));
 						break;
 				}
 */
-				$this->Logger()->Write(Utils::jsonEncode($aPost), \LOG_INFO, 'POST', true);
+				$this->Logger()->Write(Utils::jsonEncode($aPost), \LOG_INFO, 'POST');
 			} else if (3 < \count($this->aPaths) && $this->oHttp->IsGet()) {
 				$this->oActions->SetActionParams(array(
 					'RawKey' => empty($this->aPaths[3]) ? '' : $this->aPaths[3]