Fixed the return codes for empty passwords and username match failures.
Merge branch 'dev'