Improved finding of localpart