Improve Login and Add password reminder
fix conflicts