diff --git a/api/v1/serializers/user.py b/api/v1/serializers/user.py
index 79f17d32..3903a66d 100644
--- a/api/v1/serializers/user.py
+++ b/api/v1/serializers/user.py
@@ -1,6 +1,6 @@
 from phonenumber_field.serializerfields import PhoneNumberField
 from rest_framework import serializers
-
+from drf_dynamic_fields import DynamicFieldsMixin
 from django.contrib.auth import get_user_model
 
 from api.v1.serializers.content import GallerySerializer, GalleryImageSerializer, GalleryImageCreateSerializer
@@ -11,7 +11,7 @@ from .mixins import DispatchGalleryMixin
 User = get_user_model()
 
 
-class UserSerializer(serializers.ModelSerializer):
+class UserSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
     phone = PhoneNumberField(required=False, allow_null=True, allow_blank=True)
 
     class Meta:
diff --git a/api/v1/views.py b/api/v1/views.py
index 6f475b55..1122282d 100644
--- a/api/v1/views.py
+++ b/api/v1/views.py
@@ -455,8 +455,6 @@ class UserViewSet(ExtendedModelViewSet):
                 serializer = self.get_serializer(page, many=True)
                 return self.get_paginated_response(serializer.data)
 
-        # FIXME
-        queryset = queryset[:2000]
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)