Added missing account level checks