Login reset&demo final

hi just seeing if it works ! see if you can merge this together with the master ?