modified logout, added change password