lost password
fix merge conflicts
flash dialog