Fixed a couple of password related bugs