Finished the password machinery