Fix current_user issue