diff --git a/plugins/change-password/drivers/ldap.php b/plugins/change-password/drivers/ldap.php
index e61febd81..e1fc347c4 100644
--- a/plugins/change-password/drivers/ldap.php
+++ b/plugins/change-password/drivers/ldap.php
@@ -66,8 +66,8 @@ class ChangePasswordDriverLDAP
 			'{email:domain}' => $sDomain,
 			'{login}' => $oAccount->Login(),
 			'{imap:login}' => $oAccount->Login(),
-			'{imap:host}' => $oAccount->DomainIncHost(),
-			'{imap:port}' => $oAccount->DomainIncPort(),
+			'{imap:host}' => $oAccount->Domain()->IncHost(),
+			'{imap:port}' => $oAccount->Domain()->IncPort(),
 			'{gecos}' => \function_exists('posix_getpwnam') ? \posix_getpwnam($oAccount->Login()) : ''
 		));
 
diff --git a/plugins/change-password/index.php b/plugins/change-password/index.php
index 2bd4c84ad..57524f604 100644
--- a/plugins/change-password/index.php
+++ b/plugins/change-password/index.php
@@ -6,9 +6,9 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Change Password',
-		VERSION  = '2.3',
+		VERSION  = '2.9',
 		RELEASE  = '2021-07-20',
-		REQUIRED = '2.5.0',
+		REQUIRED = '2.9.1',
 		CATEGORY = 'Security',
 		DESCRIPTION = 'Extension to allow users to change their passwords';