add PasswordExeption to validateinput
Merge origin/master