Password is optional

**WIP - NOT READY FOR REVIEW**