Fix devise breakage due to upgrade