Update to password passing behavior