Added support for auto login tokens