More work on the password command.