Use real user_id for recovery token instead of form data not always reliable
Merge branch 'develop' of https://github.com/J4LP/newauth into develop