Refactored and expanded sale session restriction