fix BOTH bugs that lead to password errors around char 20 (in default charset)