fixes #63 - Forgot password not working, security update
Merge commit 'a5d8e8707d77b94b065b0988e37ed90571609776' into develop - forgot password fix