committing Hendrik Brummermann's checkPassword() patch, plus some modifications to...