Somehow managed to leave out half a refactor
I don't understand you, Git.
Merge pull request #1 from 14jesenskyd/feature-UserPermissions

Fix a broken merge...