UNTESTED registration token support (#10)