Started working on password recovery