Error message on no password
Merge branch 'dev'