fixed the current_user bug after devise changes