space based tokens and from email id changed