Password recovery now works!
Merge done!