Change Password Bug Fix