Change the way incomplete user tokens are issued and handled