Fixed problem with clearing old auth tokens.
Merge branch 'ent'