diff --git a/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/InPossessionInfo.php b/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/InPossessionInfo.php
index 78aa7c0f05..19c2aebe62 100644
--- a/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/InPossessionInfo.php
+++ b/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/InPossessionInfo.php
@@ -11,14 +11,11 @@ class InPossessionInfo
      * @Form\Required(true)
      * @Form\AllowEmpty(true)
      * @Form\ContinueIfEmpty(true)
-     * @Form\Type("Number")
      * @Form\Options({
      *     "label":"licence.surrender.current_discs.destroy.number.label",
      * })
      * @Form\Attributes({
      *      "class":"govuk-input govuk-!-width-one-third",
-     *      "step": "any",
-     *      "min": 0
      * })
      * @Form\Validator("ValidateIf",
      *      options={
diff --git a/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/LostInfo.php b/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/LostInfo.php
index ace66ed05d..dea4c3fd41 100644
--- a/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/LostInfo.php
+++ b/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/LostInfo.php
@@ -11,14 +11,11 @@ class LostInfo
      * @Form\Required(true)
      * @Form\AllowEmpty(true)
      * @Form\ContinueIfEmpty(true)
-     * @Form\Type("Number")
      * @Form\Options({
      *     "label": "licence.surrender.current_discs.lost.label",
      * })
      * @Form\Attributes({
      *      "class": "govuk-input govuk-!-width-one-third",
-     *      "step": "any",
-     *      "min": 0
      * })
      * @Form\Validator("ValidateIf",
      *      options={
diff --git a/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/StolenInfo.php b/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/StolenInfo.php
index eea098ff4a..ea23125f8b 100644
--- a/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/StolenInfo.php
+++ b/app/selfserve/module/Olcs/src/Form/Model/Form/Surrender/CurrentDiscs/Fieldset/StolenInfo.php
@@ -9,16 +9,12 @@ class StolenInfo
     /**
      * @Form\Name("number")
      * @Form\Required(true)
-     * @Form\AllowEmpty(true)
      * @Form\ContinueIfEmpty(true)
-     * @Form\Type("Number")
      * @Form\Options({
      *     "label":"licence.surrender.current_discs.stolen.number.label",
      * })
      * @Form\Attributes({
      *      "class":"govuk-input govuk-!-width-one-third",
-     *      "step": "any",
-     *      "min": 0
      * })
      * @Form\Validator("ValidateIf",
      *      options={
@@ -27,6 +23,12 @@ class StolenInfo
      *          "inject_post_data": "stolenSection->stolen",
      *          "validators": {
      *              {
+     *                  "name": "NotEmpty",
+     *                  "options": {
+     *                      "messages": {"isEmpty" : "Value is required and can't be empty"},
+     *                  }
+     *              },
+     *              {
      *                  "name": "Digits",
      *                  "options": {
      *                      "break_chain_on_failure": true,