Issue #21, part 2: the conditions to be used with an and operator should all be enclosed in curly braces.
Merge pull request #23 from Udera/clear_pass_option

Put clear passwords as password-option. Remove the separate 'clear' password field.