Fixed small bug when registering w/o tokens