Maintain tokens after role assignments (bug 1170186)

Change-Id: Iacd2d9e09be4ab3d6a3c5acf4074e4af7e300602