***updated email to used password and host and port
Revert "***updated email to used password and host and port"

This reverts commit 0c9a142fd548d66f4f7eb61a5715b62d3bff45c2.
Merge remote-tracking branch 'origin/master'