Some Stuff because of reasons

236 :punch:
some more stuff, password recovery  and whatnot
Merge pull request #2 from carlosluislopez/Miguel

Merge Cambios de Miguel