diff --git a/app/Resources/views/beneficiary/_partial/info.html.twig b/app/Resources/views/beneficiary/_partial/info.html.twig
index 9f04e5474..607caebb7 100644
--- a/app/Resources/views/beneficiary/_partial/info.html.twig
+++ b/app/Resources/views/beneficiary/_partial/info.html.twig
@@ -38,7 +38,7 @@
                 {% if beneficiary.address.street2 %}
                     {{ beneficiary.address.street2 }}
                 {% endif %}
-                {{ "%05d"|format(beneficiary.address.zipCode) }}
+                {{ "%d"|format(beneficiary.address.zipCode) }}
                 {{ beneficiary.address.city }}
             </div>
         {% endif %}
diff --git a/src/AppBundle/Entity/Address.php b/src/AppBundle/Entity/Address.php
index e428cf25f..e1c98c215 100644
--- a/src/AppBundle/Entity/Address.php
+++ b/src/AppBundle/Entity/Address.php
@@ -42,8 +42,8 @@ class Address
      *
      * @ORM\Column(name="zipcode", type="string", length=255)
      * @Assert\NotNull(message="Le code postal est requis")
-     * @Assert\Regex(pattern="/^[0-9]+$/", message="Le code postal doit comporter que des chiffres")
-     * @Assert\Length(min="5", max="5", exactMessage="Le code postal doit comporter 5 chiffres")
+     * @Assert\Regex(pattern="/^[0-9]+$/", message="Le code postal doit comporter uniquement des chiffres")
+     * @Assert\Length(min="4", max="10", exactMessage="Le code postal doit comporter entre 4 et 10 chiffres")
      */
     private $zipcode;