-Match = AddressSplit.match(Keys[0][2]);
-if Match == None:
- (cn,mn,sn,email,account) = ('','','','','');
-else:
- (cn,mn,sn) = NameSplit(re.sub('["]','',Match.groups()[0]))
- email = Match.groups()[1] + '@' + Match.groups()[2];
- account = Match.groups()[1];
+Addr = SplitEmail(Keys[0][2]);
+(cn,mn,sn) = NameSplit(re.sub('["]','',Addr[0]))
+email = Addr[1] + '@' + Addr[2];
+account = Addr[1];