Update to password passing behavior pt 2