now tokenized
Merge branch 'token-based-registration'