Fix issue when registering with a token, when no message pin is required...

....

Also condensed a block of code in Users\Register