Further work on password panel