Add client check on registration and allow enabling both registration modes

Add client check on registration and allow enabling both registration modes #10987