Improve password flow

Handle case when no password is provided, but one is required.