Fixing credentials API.