Forgotpassword

Fixing a bug in "forgot password" -- it hadn't been modified to allow "login or email address".