diff --git a/admin/inc/class.admin_account.inc.php b/admin/inc/class.admin_account.inc.php
index 907c98a704..f35583c704 100644
--- a/admin/inc/class.admin_account.inc.php
+++ b/admin/inc/class.admin_account.inc.php
@@ -80,7 +80,10 @@ class admin_account
 					'loginshell' => $GLOBALS['egw_info']['server']['ldap_account_shell'],
 				);
 			}
-			$account['ldap_extra_attributes'] = $GLOBALS['egw_info']['server']['ldap_extra_attributes'];
+			// should we show extra ldap attributes home-directory and login-shell
+			$account['ldap_extra_attributes'] = $GLOBALS['egw_info']['server']['ldap_extra_attributes'] &&
+				get_class($GLOBALS['egw']->accounts) === 'accounts_ldap';
+
 			$readonlys = array();
 
 			if ($deny_edit)