Hotfix/auth admin

I want to push the progress I made on this to develop and I'll reopen it later to continue working on it. This way I can start working on Feature/ActivityFeed with a clean conscience. I'll update the issue I opened to reflect the state of the fix.