including mailer component and login changes