generalize password option

Change-Id: I42e90cef20de1b051882c074306084e130c378c5