diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
index a15854509..4daa9fe28 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
@@ -102,10 +102,18 @@ class DocumentCategoryController extends AbstractController
     public function new(Request $request): Response
     {
         $em = $this->getDoctrine()->getManager();
+
+        $nextId = $em
+            ->createQuery(
+                'SELECT MAX(c.idInsideBundle) + 1 FROM ChillDocStoreBundle:DocumentCategory c'
+            )
+            ->getSingleResult();
+
         $documentCategory = new DocumentCategory(
             ChillDocStoreBundle::class,
-            $em->getRepository(DocumentCategory::class)->nextIdInsideBundle()
+            reset($nextId)
         );
+
         $documentCategory
             ->setDocumentClass(PersonDocument::class);
 
@@ -120,8 +128,6 @@ class DocumentCategoryController extends AbstractController
             return $this->redirectToRoute('document_category_index');
         }
 
-        $documentCategory->setBundleId(ChillDocStoreBundle::class);
-
         return $this->render('ChillDocStoreBundle:DocumentCategory:new.html.twig', [
             'document_category' => $documentCategory,
             'form' => $form->createView(),
diff --git a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
index 97265f2dc..62c63fe1f 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
@@ -37,13 +37,13 @@ class DocumentCategoryType extends AbstractType
         $builder
             ->add('bundleId', ChoiceType::class, [
                 'choices' => $this->chillBundlesFlipped,
-                'disabled' => true,
+                'disabled' => false,
             ])
             ->add('idInsideBundle', null, [
                 'disabled' => true,
             ])
             ->add('documentClass', null, [
-                'disabled' => true,
+                'disabled' => false,
             ]) // cahcerh par default PersonDocument
             ->add('name', TranslatableStringFormType::class);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
index f930e8ece..e91cdad9a 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
@@ -61,15 +61,4 @@ class DocumentCategoryRepository implements ObjectRepository
     {
         return DocumentCategory::class;
     }
-
-    public function nextIdInsideBundle()
-    {
-        $array_res = $this->em
-            ->createQuery(
-                'SELECT MAX(c.idInsideBundle) + 1 FROM ChillDocStoreBundle:DocumentCategory c'
-            )
-            ->getSingleResult();
-
-        return reset($array_res);
-    }
 }