Got passwords working correctly and cleaned up

The previous method of checking the password never made sure that the
password corresponded to that exact account number, this fixes it.