Merge "Add user for credstore."