diff --git a/ui-ngx/src/app/modules/home/components/device/device-credentials.component.ts b/ui-ngx/src/app/modules/home/components/device/device-credentials.component.ts
index 19e9419829..21c8d40a42 100644
--- a/ui-ngx/src/app/modules/home/components/device/device-credentials.component.ts
+++ b/ui-ngx/src/app/modules/home/components/device/device-credentials.component.ts
@@ -148,6 +148,7 @@ export class DeviceCredentialsComponent implements ControlValueAccessor, OnInit,
     } else {
       this.deviceCredentialsFormGroup.enable({emitEvent: false});
       this.updateValidators();
+      this.deviceCredentialsFormGroup.updateValueAndValidity();
     }
   }