Merging branch onPasswordChangeGoTo