Logic flow change.

Thanks @gtmanfred !
Restore an eauth token routine