Honor skip passwords

This is #145 rebased on top of the latest master.