diff --git a/package.json b/package.json
index 4716e62be..60afe4bd2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-amrs",
-  "version": "2.18.1",
+  "version": "2.18.2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --port 3000",
diff --git a/src/app/patient-dashboard/common/patient-identifier/patient-identifiers.service.ts b/src/app/patient-dashboard/common/patient-identifier/patient-identifiers.service.ts
index ea84790fa..168245d4a 100644
--- a/src/app/patient-dashboard/common/patient-identifier/patient-identifiers.service.ts
+++ b/src/app/patient-dashboard/common/patient-identifier/patient-identifiers.service.ts
@@ -27,7 +27,6 @@ export class PatientIdentifierService {
     }
     sum = Math.abs(sum) + 10;
     const digit = (10 - (sum % 10)) % 10;
-    console.log('Lunh Check Digit Is =' + digit);
     return digit;
   }
 
@@ -139,7 +138,7 @@ export class PatientIdentifierService {
       },
       {
         label: 'NAT',
-        format: 'NAT-\\d{4}$',
+        format: 'NAT-\\d{4,6}$',
         checkdigit: 0,
         val: '22ee6ad7-58fb-4382-9af2-c6a553f3d56a'
       },