Move current_user setting into method, adjust order of before_filters