fix for user with email=username field