Move password email delivery to private method
Move whole delivery to private method