From def180e7850133836b29697b8032fa562fdb0a8e Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 20 May 2022 07:44:18 +0200
Subject: [PATCH] Resolve #351

---
 plugins/change-password-poppassd/driver.php | 4 +---
 plugins/change-password-poppassd/index.php  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/change-password-poppassd/driver.php b/plugins/change-password-poppassd/driver.php
index 4d49fb972..c087e9673 100644
--- a/plugins/change-password-poppassd/driver.php
+++ b/plugins/change-password-poppassd/driver.php
@@ -56,11 +56,9 @@ class ChangePasswordPoppassdDriver extends \MailSo\Net\NetClient
 					\MailSo\Log\Enumerations\Type::ERROR, true);
 			}
 
-			$sLogin = \trim($sLogin);
-
 			try
 			{
-				$this->sendRequestWithCheck('user', \trim($sLogin), true);
+				$this->sendRequestWithCheck('user', $oAccount->Login(), true);
 				$this->sendRequestWithCheck('pass', $sPassword, true);
 			}
 			catch (\Throwable $oException)
diff --git a/plugins/change-password-poppassd/index.php b/plugins/change-password-poppassd/index.php
index 007b671c7..e801a4bd3 100644
--- a/plugins/change-password-poppassd/index.php
+++ b/plugins/change-password-poppassd/index.php
@@ -6,8 +6,8 @@ class ChangePasswordPoppassdPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Change Password Poppassd',
-		VERSION  = '2.15',
-		RELEASE  = '2022-04-28',
+		VERSION  = '2.16',
+		RELEASE  = '2022-05-20',
 		REQUIRED = '2.15.3',
 		CATEGORY = 'Security',
 		DESCRIPTION = 'Extension to allow users to change their passwords through Poppassd';