Moved client id into admin form.