diff --git a/modoboa/admin/api.py b/modoboa/admin/api.py
index fed9bea69..b50cef20c 100644
--- a/modoboa/admin/api.py
+++ b/modoboa/admin/api.py
@@ -70,7 +70,8 @@ class AccountViewSet(viewsets.ModelViewSet):
         """Return a serializer."""
         action_dict = {
             "list": serializers.AccountSerializer,
-            "retrieve": serializers.AccountSerializer
+            "retrieve": serializers.AccountSerializer,
+            "password": serializers.AccountPasswordSerializer
         }
         return action_dict.get(
             self.action, serializers.WritableAccountSerializer)
@@ -94,8 +95,7 @@ class AccountViewSet(viewsets.ModelViewSet):
             user = core_models.User.objects.get(pk=pk)
         except core_models.User.DoesNotExist:
             raise http.Http404
-        serializer = serializers.AccountPasswordSerializer(
-            user, data=request.data)
+        serializer = self.get_serializer(user, data=request.data)
         if serializer.is_valid():
             serializer.save()
             return Response()