Issue #30 Added PasswordEventListener again