Added some account checks, broke some pages but easy to fix