diff --git a/emailadmin/inc/class.emailadmin_account.inc.php b/emailadmin/inc/class.emailadmin_account.inc.php
index 42ca10d9bc..d8749d3fa6 100644
--- a/emailadmin/inc/class.emailadmin_account.inc.php
+++ b/emailadmin/inc/class.emailadmin_account.inc.php
@@ -55,8 +55,8 @@
  * @property-read string $acc_imap_logintype how to construct login-name standard, vmailmgr, admin, uidNumber
  * @property-read string $acc_domain domain name
  * @property-read boolean $acc_imap_administration enable administration
- * @property-read string $acc_admin_username
- * @property-read string $acc_admin_password
+ * @property-read string $acc_imap_admin_username
+ * @property-read string $acc_imap_admin_password
  * @property-read boolean $acc_further_identities are non-admin users allowed to create further identities
  * @property-read boolean $acc_user_editable are non-admin users allowed to edit this account, if it is for them
  * @property-read int $acc_modified timestamp of last modification
diff --git a/emailadmin/inc/class.emailadmin_hooks.inc.php b/emailadmin/inc/class.emailadmin_hooks.inc.php
index 6655d646a9..ba8116662a 100644
--- a/emailadmin/inc/class.emailadmin_hooks.inc.php
+++ b/emailadmin/inc/class.emailadmin_hooks.inc.php
@@ -115,8 +115,8 @@ class emailadmin_hooks
 				{
 					$smtp->$method($data);
 				}
-				if ($account->acc_imap_type != 'emailadmin_imap' && $account->acc_admin_username &&
-					$account->acc_admin_password && ($imap = $account->imapServer(true)) &&
+				if ($account->acc_imap_type != 'emailadmin_imap' && $account->acc_imap_admin_username &&
+					$account->acc_imap_admin_password && ($imap = $account->imapServer(true)) &&
 					is_a($imap, 'emailadmin_imap') && get_class($imap) != 'emailadmin_imap')
 				{
 					$imap->$method($data);