Bug fix credential manager