Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev