diff --git a/src/components/Cars/Add/index.jsx b/src/components/Cars/Add/index.jsx
index b3ce2e3..c5ea3d3 100644
--- a/src/components/Cars/Add/index.jsx
+++ b/src/components/Cars/Add/index.jsx
@@ -1,5 +1,3 @@
-import React, { useEffect, useRef, useState } from "react";
-import { Redirect } from "react-router";
 import {
   Button,
   Checkbox,
@@ -10,15 +8,18 @@ import {
   RadioGroup,
   TextField
 } from "@material-ui/core";
+import React, { useEffect, useState } from "react";
+import { Redirect } from "react-router";
 
-import useStyles from "../../useStyles";
-import {
-  useVehicleContext,
-  VehicleProvider,
-} from "../../Contexts/VehicleContext";
+import { logger } from "../../../services/monitoring";
+import { getVINOnChangeHandler } from "../../../utils/vinValidation";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import { useUserContext } from "../../Contexts/UserContext";
-import { logger } from "../../../services/monitoring";
+import {
+  useVehicleContext,
+  VehicleProvider
+} from "../../Contexts/VehicleContext";
+import useStyles from "../../useStyles";
 
 const MainForm = () => {
   const { addVehicle, busy } = useVehicleContext();
@@ -31,7 +32,7 @@ const MainForm = () => {
   const classes = useStyles();
   const [redirect, setRedirect] = useState(null);
 
-  const vinEl = useRef(null);
+  const [vin, setVIN] = useState("");
   const [selectedLogLevel, setSelectedLogLevel] = useState("info");
   const [canbusEnabled, setCANBusEnabled] = useState(true);
   const [dataLoggerEnabled, setDataLoggerEnabled] = useState(false);
@@ -77,7 +78,7 @@ const MainForm = () => {
       event.preventDefault();
 
       const formData = {
-        vin: vinEl.current.value,
+        vin,
         log_level: selectedLogLevel,
         canbus: {
           enabled: canbusEnabled,
@@ -115,7 +116,8 @@ const MainForm = () => {
           }}
           required
           fullWidth
-          inputRef={vinEl}
+          value={vin}
+          onChange={getVINOnChangeHandler(setVIN)}
         />
         <FormLabel id="demo-row-radio-buttons-group-label">Log Level</FormLabel>
         <RadioGroup
diff --git a/src/components/Cars/Status/Details/index.jsx b/src/components/Cars/Status/Details/index.jsx
index 6307310..ac34a8a 100644
--- a/src/components/Cars/Status/Details/index.jsx
+++ b/src/components/Cars/Status/Details/index.jsx
@@ -33,7 +33,7 @@ const MainForm = ({ vin }) => {
   } = useUserContext();
 
   const ENV = process.env.REACT_APP_ENV;
-  const showDebugMask = (ENV === 'local' || ENV === 'dev' || ENV === 'stg')
+  const showDebugMask = (ENV === 'local' || ENV === 'dev' || ENV === 'stg' || ENV === 'prd')
 
   useEffect(() => {
     (async () => {
diff --git a/src/components/Cars/Update/index.jsx b/src/components/Cars/Update/index.jsx
index 5302f33..cdbf11d 100644
--- a/src/components/Cars/Update/index.jsx
+++ b/src/components/Cars/Update/index.jsx
@@ -49,7 +49,7 @@ const MainForm = () => {
   const debugMaskEl = useRef(null);
 
   const ENV = process.env.REACT_APP_ENV;
-  const showDebugMask = (ENV === 'local' || ENV === 'dev' || ENV === 'stg')
+  const showDebugMask = (ENV === 'local' || ENV === 'dev' || ENV === 'stg' || ENV === 'prd')
 
   useEffect(() => {
     setTitle("Update Vehicle");
diff --git a/src/components/Certificates/Add/CreateForm.jsx b/src/components/Certificates/Add/CreateForm.jsx
index c7855e6..b5e8a00 100644
--- a/src/components/Certificates/Add/CreateForm.jsx
+++ b/src/components/Certificates/Add/CreateForm.jsx
@@ -6,10 +6,11 @@ import {
   RadioGroup,
   TextField
 } from "@material-ui/core";
-import React, { useRef, useState } from "react";
+import React, { useState } from "react";
 
 import { CertTypeData, CertTypes } from "../../../utils/certificates";
 import { Providers } from "../../../utils/roles";
+import { getVINOnChangeHandler } from "../../../utils/vinValidation";
 import { useUserContext } from "../../Contexts/UserContext";
 import useStyles from "../../useStyles";
 
@@ -31,16 +32,21 @@ const getCertsTypes = (providers) => {
 
 const CreateForm = ({ onCreate, busy }) => {
   const classes = useStyles();
-  const commonnameEl = useRef(null);
   const {providers} = useUserContext();
+  const [commonName, setCommonName] = useState("");
   const [certType, setCertType] = useState(CertTypes.TBOX);
+  const onVINChange = getVINOnChangeHandler(setCommonName);
+  const onAftersaleChange = (e) => {
+    const value = e.target.value ?? "";
+    setCommonName(value);
+  }
 
   const onSubmit = async (event) => {
     event.preventDefault();
 
     if (onCreate)
       onCreate({
-        common_name: commonnameEl.current.value,
+        common_name: commonName,
         type: certType,
       });
   };
@@ -63,7 +69,8 @@ const CreateForm = ({ onCreate, busy }) => {
           }}
           required
           fullWidth
-          inputRef={commonnameEl}
+          value={commonName}
+          onChange={certType === CertTypes.Aftersales ? onAftersaleChange : onVINChange}
         />
         <FormLabel id="cert-type-group-label">Type</FormLabel>
         <RadioGroup
diff --git a/src/utils/strings.js b/src/utils/strings.js
index 38df487..67c2567 100644
--- a/src/utils/strings.js
+++ b/src/utils/strings.js
@@ -10,4 +10,4 @@ export function trimIfMoreThan(maybeString, maxLength = 20, sfx = "") {
   }
 
   return ""
-}
\ No newline at end of file
+}
diff --git a/src/utils/vinValidation.js b/src/utils/vinValidation.js
new file mode 100644
index 0000000..bcf1905
--- /dev/null
+++ b/src/utils/vinValidation.js
@@ -0,0 +1,9 @@
+export const regExVIN = /^[A-HJ-NPR-Z0-9]{0,17}$/;
+
+export const getVINOnChangeHandler = (setFn) => {
+  return (e) => {
+    const value = e?.target?.value.toUpperCase() ?? "";
+    if (!value.match(regExVIN)) return;
+    setFn(value.toUpperCase());
+  }
+}
\ No newline at end of file