diff --git a/src/app/registeredMail/controllers/RegisteredMailController.php b/src/app/registeredMail/controllers/RegisteredMailController.php
index f35b018089b9e044628eaa558e1cb856ee588e6f..74202a10cd6c2279bc5907adb8f2124011fce7da 100644
--- a/src/app/registeredMail/controllers/RegisteredMailController.php
+++ b/src/app/registeredMail/controllers/RegisteredMailController.php
@@ -171,13 +171,14 @@ class RegisteredMailController
             return $response->withStatus(400)->withJson(['errors' => 'Body number is not valid']);
         }
 
+        $type = substr($body['number'], 0, 2);
         $number = substr($body['number'], 3, 12);
         $number = str_replace(' ', '', $number);
 
         $registeredMail = RegisteredMailModel::get([
             'select' => ['id', 'res_id', 'received_date'],
-            'where'  => ['number = ?'],
-            'data'   => [$number]
+            'where'  => ['number = ?', 'type = ?'],
+            'data'   => [$number, $type]
         ]);
         if (empty($registeredMail)) {
             return $response->withStatus(400)->withJson(['errors' => 'Registered mail number not found']);
diff --git a/src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.html b/src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.html
index 7d0f4d03d73ead8ec3b142d91f361f4cf4d83697..de52197b217c835567f219f93335642ea10f2567 100644
--- a/src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.html
+++ b/src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.html
@@ -52,7 +52,7 @@
                                 <input matInput name="returnReasonOther" formControlName="returnReasonOther" [(ngModel)]="reasonOther">
                             </mat-form-field>
 
-                            <mat-form-field>
+                            <mat-form-field *ngIf="type === 'notDistributed' || type === 'distributed'">
                                 <mat-label>{{'lang.registeredMailNumber' | translate}}</mat-label>
                                 <input #numberInput type="text" matInput required [(ngModel)]="number" formControlName="number">
                             </mat-form-field>
diff --git a/src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.ts b/src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.ts
index fe912ff3a672cecb5205fcd26459f93f7a3114f9..376503e3d29b47f94f40fdfe11a9c88caf2e4257 100644
--- a/src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.ts
+++ b/src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.ts
@@ -21,7 +21,7 @@ export class AcknowledgementReceptionComponent implements OnInit {
 
     today: Date = new Date();
 
-    type: any = 'distributed';
+    type: any;
     number: any;
     receivedDate: any = this.today;
     reason: any;
@@ -60,8 +60,8 @@ export class AcknowledgementReceptionComponent implements OnInit {
         this.adminFormGroup = this._formBuilder.group({
             type: ['', Validators.required],
             number: ['', validatorNumber],
-            receivedDate: ['', Validators.required],
-            returnReason: ['', Validators.required],
+            receivedDate: [''],
+            returnReason: [''],
             returnReasonOther: ['']
         });
         this.loading = false;