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 c6af9eb5e..4ebf93fc3 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
@@ -22,7 +22,10 @@ trait UserAuth
 	/**
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function resolveLoginCredentials(string &$sEmail, string &$sPassword, string &$sLogin): void
+	public function resolveLoginCredentials(string &$sEmail,
+		#[\SensitiveParameter]
+		string &$sPassword,
+		string &$sLogin): void
 	{
 		$this->Plugins()->RunHook('login.credentials.step-1', array(&$sEmail));
 
@@ -113,7 +116,11 @@ trait UserAuth
 	/**
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function LoginProcess(string &$sEmail, string &$sPassword, bool $bMainAccount = true): Account
+	public function LoginProcess(string &$sEmail,
+		#[\SensitiveParameter]
+		string &$sPassword,
+		bool $bMainAccount = true
+	): Account
 	{
 		$sInputEmail = $sEmail;
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
index 16200a64e..5b8e8796b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -77,7 +77,11 @@ abstract class Api
 		return APP_VERSION;
 	}
 
-	public static function CreateUserSsoHash(string $sEmail, string $sPassword, array $aAdditionalOptions = array(), bool $bUseTimeout = true) : ?string
+	public static function CreateUserSsoHash(string $sEmail,
+		#[\SensitiveParameter]
+		string $sPassword,
+		array $aAdditionalOptions = array(), bool $bUseTimeout = true
+	) : ?string
 	{
 		$sSsoHash = \MailSo\Base\Utils::Sha1Rand(\sha1($sPassword.$sEmail));
 
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 8f7bdf1a1..29773aec8 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
@@ -116,12 +116,18 @@ class Application extends \RainLoop\Config\AbstractConfig
 		parent::Set($sSectionKey, $sParamKey, $mParamValue);
 	}
 
-	public function SetPassword(string $sPassword) : void
+	public function SetPassword(
+		#[\SensitiveParameter]
+		string $sPassword
+	) : void
 	{
 		$this->Set('security', 'admin_password', \password_hash($sPassword, PASSWORD_DEFAULT));
 	}
 
-	public function ValidatePassword(string $sPassword) : bool
+	public function ValidatePassword(
+		#[\SensitiveParameter]
+		string $sPassword
+	) : bool
 	{
 		$sConfigPassword = (string) $this->Get('security', 'admin_password', '');
 		if (32 == \strlen($sPassword) && \md5(APP_SALT.$sPassword.APP_SALT) === $sConfigPassword) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
index 8c7becdcb..2833a9422 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
@@ -130,7 +130,10 @@ trait CardDAV
 		return null;
 	}
 
-	private function getContactsPaths(DAVClient $oClient, string $sPath, string $sUser, string $sPassword, string $sProxy = '') : array
+	private function getContactsPaths(DAVClient $oClient, string $sPath, string $sUser,
+		#[\SensitiveParameter]
+		string $sPassword,
+		string $sProxy = '') : array
 	{
 		$aContactsPaths = array();
 
@@ -291,7 +294,11 @@ trait CardDAV
 		return $bGood;
 	}
 
-	private function getDavClientFromUrl(string $sUrl, string $sUser, string $sPassword, string $sProxy = '') : DAVClient
+	private function getDavClientFromUrl(string $sUrl, string $sUser,
+		#[\SensitiveParameter]
+		string $sPassword,
+		string $sProxy = ''
+	) : DAVClient
 	{
 		if (!\preg_match('/^http[s]?:\/\//i', $sUrl)) {
 			$sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl);