Made some changes for the recover lost password menu item.
Merge remote-tracking branch 'origin/master'