[509-improve-disabling-client-id] [509-improve-disabling-client-id-] Improved client-id lookup by code