CLIENT ID/SECRET removal fix