Some tidying up
Changes to password form