diff --git a/src/Entity/DBElement.php b/src/Entity/DBElement.php
index 0699e000..b1233bbd 100644
--- a/src/Entity/DBElement.php
+++ b/src/Entity/DBElement.php
@@ -76,7 +76,7 @@ abstract class DBElement
      */
     final public function getID(): ?int
     {
-        return (int) $this->id;
+        return $this->id;
     }
 
     /**
diff --git a/src/Form/BaseEntityAdminForm.php b/src/Form/BaseEntityAdminForm.php
index fd570ded..36f07293 100644
--- a/src/Form/BaseEntityAdminForm.php
+++ b/src/Form/BaseEntityAdminForm.php
@@ -32,6 +32,7 @@
 namespace App\Form;
 
 
+use App\Entity\StructuralDBElement;
 use FOS\CKEditorBundle\Form\Type\CKEditorType;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
@@ -54,7 +55,9 @@ class BaseEntityAdminForm extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        /** @var StructuralDBElement $entity */
         $entity = $options['data'];
+        $is_new = $entity->getID() === null;
 
         $builder
             ->add('name', TextType::class, ['empty_data' => '', 'label' => 'name.label',
@@ -70,7 +73,8 @@ class BaseEntityAdminForm extends AbstractType
                 'disabled' => !$this->security->isGranted('edit', $entity)])
 
             //Buttons
-            ->add('save', SubmitType::class, ['label' => 'part.edit.save'])
-            ->add('reset', ResetType::class, ['label' => 'part.edit.reset']);
+            ->add('save', SubmitType::class, ['label' =>  $is_new ? 'entity.create' : 'entity.edit.save',
+                'attr' => ['class' => $is_new ? 'btn-success' : '']])
+            ->add('reset', ResetType::class, ['label' => 'entity.edit.reset']);
     }
 }
\ No newline at end of file