diff --git a/plugins/change-password-poppassd/driver.php b/plugins/change-password-poppassd/driver.php
index e26ef34bc..6cddf6e7b 100644
--- a/plugins/change-password-poppassd/driver.php
+++ b/plugins/change-password-poppassd/driver.php
@@ -152,13 +152,13 @@ class ChangePasswordPoppassdDriver extends \MailSo\Net\NetClient
 
 	private function validateResponse(bool $bAuthRequestValidate = false) : self
 	{
-		$this->getNextBuffer();
+		$sResponseBuffer = $this->getNextBuffer();
 
-		$bResult = \preg_match($bAuthRequestValidate ? '/^[23]\d\d/' : '/^2\d\d/', trim($this->sResponseBuffer));
+		$bResult = \preg_match($bAuthRequestValidate ? '/^[23]\d\d/' : '/^2\d\d/', \trim($sResponseBuffer));
 
 		if (!$bResult) {
 			// POP3 validation hack
-			$bResult = '+OK ' === \substr(\trim($this->sResponseBuffer), 0, 4);
+			$bResult = '+OK ' === \substr(\trim($sResponseBuffer), 0, 4);
 		}
 
 		if (!$bResult) {
diff --git a/plugins/change-password-poppassd/index.php b/plugins/change-password-poppassd/index.php
index a66c13f79..19f0c0502 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.19',
-		RELEASE  = '2023-06-05',
+		VERSION  = '2.20',
+		RELEASE  = '2023-12-08',
 		REQUIRED = '2.28.0',
 		CATEGORY = 'Security',
 		DESCRIPTION = 'Extension to allow users to change their passwords through Poppassd';