Removed reference to: $user->salt

The reference to not existing property $user->salt would generate an
error message at /forgot_password page.
The Email Type setting fail to reflect it's current state.
Merge pull request #816 from andyvr/develop

Minor fixes in /forgot_password and /admin/settings/emailer pages.