Login support per issue #AE-1