fixed typo + improved password generation logic
Merge branch 'develop'