Added password error, among other thigs