Turn off token check at user saving so we can register
Fixed some registration issues