Resolve #3582268 "Merge fixes"

solideogloriarequested to merge
issue/better_permissions_page-3582268:3582268-merge-fixes into 1.x

Closes #3582268

Merge request reports