WIP
Merge branch 'master' into 45_UAU_not_allowed_to
404 error rendering properly and user cannot create admin
merge branch 45