remove password from email.php
added new vars for username, pw