Add forget password function
fix conflicts.