Api Credentials fix