Some password checking by Gus has been added.