Add invalid password error message
Merge remote-tracking branch 'origin/0.0.7' into 0.0.7