Fix forms, new password & validator