diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index daa41d7d7..5fda0f6c0 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -37,33 +37,7 @@
 
             <div class="item-list">
                 @foreach($users as $user)
-                    <div class="flex-container-row item-list-row items-center wrap py-s">
-                        <div class="px-m py-xs flex-container-row items-center flex-2 gap-l min-width-m">
-                            <img class="avatar med" width="40" height="40" src="{{ $user->getAvatar(40)}}" alt="{{ $user->name }}">
-                            <a href="{{ url("/settings/users/{$user->id}") }}">
-                                {{ $user->name }}
-                                <br>
-                                <span class="text-muted">{{ $user->email }}</span>
-                                @if($user->mfa_values_count > 0)
-                                    <span title="MFA Configured" class="text-pos">@icon('lock')</span>
-                                @endif
-                            </a>
-                        </div>
-                        <div class="flex-container-row items-center flex-3 min-width-m">
-                            <div class="px-m py-xs flex">
-                                @foreach($user->roles as $index => $role)
-                                    <small><a href="{{ url("/settings/roles/{$role->id}") }}">{{$role->display_name}}</a>@if($index !== count($user->roles) -1),@endif</small>
-                                @endforeach
-                            </div>
-                            <div class="px-m py-xs flex text-right text-muted">
-                                @if($user->last_activity_at)
-                                    <small>{{ trans('settings.users_latest_activity') }}</small>
-                                    <br>
-                                    <small title="{{ $user->last_activity_at->format('Y-m-d H:i:s') }}">{{ $user->last_activity_at->diffForHumans() }}</small>
-                                @endif
-                            </div>
-                        </div>
-                    </div>
+                    @include('users.parts.users-list-item', ['user' => $user])
                 @endforeach
             </div>
 
diff --git a/resources/views/users/parts/users-list-item.blade.php b/resources/views/users/parts/users-list-item.blade.php
new file mode 100644
index 000000000..ffc74d708
--- /dev/null
+++ b/resources/views/users/parts/users-list-item.blade.php
@@ -0,0 +1,27 @@
+<div class="flex-container-row item-list-row items-center wrap py-s">
+    <div class="px-m py-xs flex-container-row items-center flex-2 gap-l min-width-m">
+        <img class="avatar med" width="40" height="40" src="{{ $user->getAvatar(40)}}" alt="{{ $user->name }}">
+        <a href="{{ url("/settings/users/{$user->id}") }}">
+            {{ $user->name }}
+            <br>
+            <span class="text-muted">{{ $user->email }}</span>
+            @if($user->mfa_values_count > 0)
+                <span title="MFA Configured" class="text-pos">@icon('lock')</span>
+            @endif
+        </a>
+    </div>
+    <div class="flex-container-row items-center flex-3 min-width-m">
+        <div class="px-m py-xs flex">
+            @foreach($user->roles as $index => $role)
+                <small><a href="{{ url("/settings/roles/{$role->id}") }}">{{$role->display_name}}</a>@if($index !== count($user->roles) -1),@endif</small>
+            @endforeach
+        </div>
+        <div class="px-m py-xs flex text-right text-muted">
+            @if($user->last_activity_at)
+                <small>{{ trans('settings.users_latest_activity') }}</small>
+                <br>
+                <small title="{{ $user->last_activity_at->format('Y-m-d H:i:s') }}">{{ $user->last_activity_at->diffForHumans() }}</small>
+            @endif
+        </div>
+    </div>
+</div>
\ No newline at end of file