Fix bug in last commit
More user/permissions/roles stuff