Fix search
Password Reset Email Setup
Merge branch 'Add-email-password-reset-'