Updated register token

Fixes #353
Fixes #341