Password reset

Ready to merge.