diff --git a/resources/js/app/components/relation-view/roles-list-view.vue b/resources/js/app/components/relation-view/roles-list-view.vue
index 2f26ed7f4..0e94976b4 100644
--- a/resources/js/app/components/relation-view/roles-list-view.vue
+++ b/resources/js/app/components/relation-view/roles-list-view.vue
@@ -1,17 +1,36 @@
 <template>
     <div class="roles-list-view">
         <div>
-            <div v-for="groupName in Object.keys(objectsByGroups)">
-                <h4 class="is-small has-font-weight-bold has-text-transform-upper">{{ groupName }}</h4>
-                <label v-for="role in objectsByGroups[groupName]" class="cursor-pointer">
-                    <input type="checkbox" :value="role" :disabled="userRolePriority > role.meta.priority" v-model="checkedRelations"/>
+            <div
+                v-for="groupName in Object.keys(objectsByGroups)"
+                :key="groupName"
+            >
+                <h4 class="is-small has-font-weight-bold has-text-transform-upper">
+                    {{ groupName }}
+                </h4>
+                <label
+                    v-for="role in objectsByGroups[groupName]"
+                    class="cursor-pointer"
+                    :key="role.attributes.name"
+                >
+                    <input
+                        type="checkbox"
+                        :value="role"
+                        :disabled="userRolePriority > role.meta.priority"
+                        v-model="checkedRelations"
+                    >
                     <span>{{ getRoleLabel(role.attributes.name, role.attributes.description) }}</span>
                 </label>
             </div>
         </div>
 
         <div class="save-relations">
-            <input type="hidden" :id="`${relationName}addRelated`" :name="`relations[${relationName}][addRelated]`" v-model="relationsData" />
+            <input
+                :id="`${relationName}addRelated`"
+                :name="`relations[${relationName}][addRelated]`"
+                type="hidden"
+                v-model="relationsData"
+            >
         </div>
     </div>
 </template>
diff --git a/resources/js/app/mixins/paginated-content.js b/resources/js/app/mixins/paginated-content.js
index 2fbac65f8..a2194a0b8 100644
--- a/resources/js/app/mixins/paginated-content.js
+++ b/resources/js/app/mixins/paginated-content.js
@@ -74,6 +74,10 @@ export const PaginatedContentMixin = {
                     requestUrl = requestUrl.replace('view/relationships', 'view/0/relationships');
                 }
 
+                if (requestUrl.indexOf('view/resources') >= 0) {
+                    requestUrl = requestUrl.replace('view/resources', 'view/0/resources');
+                }
+
                 // if requestQueue is populated then abort all fetch request and start over
                 if (this.requestsQueue.length > 0) {
                     this.requestController.abort();
diff --git a/templates/Element/Form/roles.twig b/templates/Element/Form/roles.twig
index dab9976f6..dc5450924 100644
--- a/templates/Element/Form/roles.twig
+++ b/templates/Element/Form/roles.twig
@@ -33,12 +33,13 @@
 
                 <div>
                     {% set rolesGroups = config('RolesGroups') ? config('RolesGroups') : {}  %}
+                    {% set userRoles = user and user.roles ? user.roles : [] %}
                     <roles-list-view
                         relation-name={{ relationName }}
                         relation-label="{{ Layout.tr(relationName) }}"
                         :related-objects="objects"
                         :groups="{{ rolesGroups|length == 0 ? '{}' : rolesGroups|json_encode }}"
-                        :user-roles="{{ user.roles|default([])|json_encode }}"
+                        :user-roles="{{ userRoles|default([])|json_encode }}"
                         @remove-relations="setRemovedRelated">
                     </roles-list-view>
                     {% do Form.unlockField('relations.' ~ relationName ~ '.addRelated') %}
diff --git a/templates/Pages/Modules/view.twig b/templates/Pages/Modules/view.twig
index bddf7192f..8f6331938 100644
--- a/templates/Pages/Modules/view.twig
+++ b/templates/Pages/Modules/view.twig
@@ -79,7 +79,7 @@
                 {{ element('Form/custom_right') }}
 
                 {# if `roles` in relationships (`users` only) display custom roles element #}
-                {% if 'roles' in object.relationships|keys %}
+                {% if 'roles' in object.relationships|keys or object.type == 'users' %}
                     {{ element('Form/roles') }}
                 {% endif %}