Fixed registration process (at least by token)