Invalid reset password token Error ! Devise 3.1

Few days back, I changed my app to authenticate users through either username or Email address. It works fine with registration and login.

but it throws an error Reset password token is invalid for forgot password after such change. it was working fine before.

I am using Devise 3.1 & Rails 3.2.13

Any help in this would be much appreciated.