Improve force password change code after review