Refactored my user model to get rid of current_email