added client-id validation