Switch to using AbortLogin hook for tokens

Change-Id: I2e1ff4f35018854ff0cfa4e649984f1d56ecb828