Merge "refactor reportPasswordChanged"