Merge with KS's code
Fix a defect in reset-verification-code: shouldnt take device id / token as param