more login fix, tests tbd next