simplify passwod edition
bug fix