Update to password passing behavior pt 4