Fix ChangePasswordForm