Add cleartext password support and fix str, int concatenation error.