Fix for login namespacing issue