Patch 1

@ares - I made the change to reflect 1.5 username/password and to pull the auto-generated password in 1.6.  Let me know if there is anything else I can do.  Thank you!