Fixes #20 again after huge refactor
Merge pull request #179 from ReneB/fix-blank-password

Fixes #20 again after huge refactor