Fixes issue when non-admin user w/ slingbar logs in
(cherry picked from commit bfba57a)