Fix compability issue with other 3rd party devise modules