More work on the password thingy