Fixed vaidation of empty passwords
Merge origin/develop into ssh