--- lib/LDAP/Koha.pm	2009/04/29 12:22:40	55
+++ lib/LDAP/Koha.pm	2009/11/13 12:43:47	60
@@ -46,7 +46,7 @@
 	'objectGUID'	=> 'borrowernumber',
 	'displayName'	=> 'surname',
 	'sn'		=> 'surname',
-	'pager'		=> 'rfid_sid',
+	'pager'		=> 'a.attribute',	# was: rfid_sid
 };
 
 sub __sql_column {
@@ -229,6 +229,8 @@
 					undef $entry;
 				}
 
+				$dn =~ s{@[^,]+}{};
+
 				$entry = Net::LDAP::Entry->new;
 				$entry->dn( $dn );