added better password scrubbing