Progress on Task-662. Still working on updating the new password