Fix the issue with credential store primary key.