Make email optional in the uid-parsing regexp