revert passwordAuth
Merge branch revert-passwordAuth