Fix public client source id again