@chrispetsos do we still need this check now that we can query the system for the logged in user?