A better password handling step