Adding email/user scenarios