Improve password handling
Improve password error handling