Completion of client id infrastructure