auth api fixes
merge commit