Password maintenance added. Needs a bit of tidying up