Pulled merge from original repository

Updated
Allows for email:pass accounts now