Fix --password tag detection with multiple options