Added hack for AutoLogin