diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 527bc6c..9363bc1 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -4532,6 +4532,57 @@ exports[`App Route /tools/certificates/add authenticated 1`] = `
                     ICC
                   </span>
                 </label>
+                <label
+                  class="MuiFormControlLabel-root"
+                >
+                  <span
+                    aria-disabled="false"
+                    class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-0 MuiRadio-root MuiRadio-colorSecondary MuiIconButton-colorSecondary"
+                  >
+                    <span
+                      class="MuiIconButton-label"
+                    >
+                      <input
+                        class="PrivateSwitchBase-input-0"
+                        name="cert-type"
+                        type="radio"
+                        value="Aftersales"
+                      />
+                      <div
+                        class="PrivateRadioButtonIcon-root-0"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="MuiSvgIcon-root"
+                          focusable="false"
+                          viewBox="0 0 24 24"
+                        >
+                          <path
+                            d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                          />
+                        </svg>
+                        <svg
+                          aria-hidden="true"
+                          class="MuiSvgIcon-root PrivateRadioButtonIcon-layer-0"
+                          focusable="false"
+                          viewBox="0 0 24 24"
+                        >
+                          <path
+                            d="M8.465 8.465C9.37 7.56 10.62 7 12 7C14.76 7 17 9.24 17 12C17 13.38 16.44 14.63 15.535 15.535C14.63 16.44 13.38 17 12 17C9.24 17 7 14.76 7 12C7 10.62 7.56 9.37 8.465 8.465Z"
+                          />
+                        </svg>
+                      </div>
+                    </span>
+                    <span
+                      class="MuiTouchRipple-root"
+                    />
+                  </span>
+                  <span
+                    class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
+                  >
+                    Aftersales
+                  </span>
+                </label>
                 <label
                   class="MuiFormControlLabel-root"
                 >
diff --git a/src/components/Certificates/Add/CreateForm.jsx b/src/components/Certificates/Add/CreateForm.jsx
index fe00a43..f15c020 100644
--- a/src/components/Certificates/Add/CreateForm.jsx
+++ b/src/components/Certificates/Add/CreateForm.jsx
@@ -1,4 +1,3 @@
-import React, { useRef, useState } from "react";
 import {
   Button,
   FormControlLabel,
@@ -7,13 +6,15 @@ import {
   RadioGroup,
   TextField,
 } from "@material-ui/core";
+import React, { useRef, useState } from "react";
 
+import { CertTypeData, CertTypes } from "../../../utils/certificates";
 import useStyles from "../../useStyles";
-import { CertTypes } from "../../Contexts/CertificateContext";
 
 const getCertTypeLabel = (certtype) => {
-  if (certtype === CertTypes.Aftersales) return "Service Tool ID";
-  return "VIN";
+  const item = CertTypeData.find((item) => certtype === item.value);
+  if (item !== null) return item.inputlabel;
+  return "ID";
 };
 
 const CreateForm = ({ onCreate, busy }) => {
@@ -60,21 +61,16 @@ const CreateForm = ({ onCreate, busy }) => {
           onChange={onCertTypeChange}
           margin="normal"
         >
-          <FormControlLabel
-            value={CertTypes.TBOX}
-            control={<Radio />}
-            label="TBOX"
-          />
-          <FormControlLabel
-            value={CertTypes.ICC}
-            control={<Radio />}
-            label="ICC"
-          />
-          <FormControlLabel
-            value={CertTypes.Charging}
-            control={<Radio />}
-            label="Charging"
-          />
+          {CertTypeData.map((item, i) => {
+            return (
+              <FormControlLabel
+                key={i}
+                value={item.value}
+                label={item.label}
+                control={<Radio />}
+              />
+            );
+          })}
         </RadioGroup>
         <Button
           type="submit"
diff --git a/src/components/Certificates/Add/index.jsx b/src/components/Certificates/Add/index.jsx
index 4b3e2ba..f49656a 100644
--- a/src/components/Certificates/Add/index.jsx
+++ b/src/components/Certificates/Add/index.jsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useState } from "react";
 
+import { logger } from "../../../services/monitoring";
 import {
-  useCertificateContext,
   CertificateProvider,
+  useCertificateContext,
 } from "../../Contexts/CertificateContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import { useUserContext } from "../../Contexts/UserContext";
-import { logger } from "../../../services/monitoring";
 import CreateForm from "./CreateForm";
 import DownloadCerts from "./DownloadCerts";
 
@@ -43,11 +43,12 @@ const MainForm = () => {
   const onCreate = async (data) => {
     try {
       const result = await createCert(data, token);
+      const name = data.common_name || data.tool_id;
 
+      setCommonName(name);
       setPubCert(result.public_key);
       setPrivCert(result.private_key);
-      setCommonName(data.common_name);
-      setMessage(`Created ${data.common_name} certificate`);
+      setMessage(`Created ${name} certificate`);
       setView(VIEW_DOWNLOAD);
     } catch (e) {
       setMessage(e.message);
diff --git a/src/components/Contexts/CertificateContext.jsx b/src/components/Contexts/CertificateContext.jsx
index 0274d95..6061c6c 100644
--- a/src/components/Contexts/CertificateContext.jsx
+++ b/src/components/Contexts/CertificateContext.jsx
@@ -1,21 +1,25 @@
 import React, { useContext, useState } from "react";
 
 import api from "../../services/certificatesAPI";
+import { CertTypes } from "../../utils/certificates";
 
 const CertificateContext = React.createContext();
 
-export const CertTypes = {
-  TBOX: "TBOX",
-  ICC: "ICC",
-  Charging: "Charging",
-  Aftersales: "Aftersales",
-};
-
 const validateCreate = (data) => {
   if (!data.type) throw new Error("type is required");
   if (!data.common_name) throw new Error("common name is required");
 };
 
+const callCreateCert = (data, token) => {
+  if (data.type === CertTypes.Aftersales) {
+    data.tool_id = data.common_name;
+    delete data.common_name;
+    return api.createAftersales(data, token);
+  }
+
+  return api.create(data, token);
+};
+
 export const CertificateProvider = ({ children }) => {
   const [busy, setBusy] = useState(false);
 
@@ -25,7 +29,8 @@ export const CertificateProvider = ({ children }) => {
 
       validateCreate(data);
 
-      const result = await api.create(data, token);
+      const result = await callCreateCert(data, token);
+
       if (result.error) {
         throw new Error(`Create certificate error. ${result.message}`);
       }
diff --git a/src/components/Contexts/CertificateContext.test.jsx b/src/components/Contexts/CertificateContext.test.jsx
new file mode 100644
index 0000000..98aaeae
--- /dev/null
+++ b/src/components/Contexts/CertificateContext.test.jsx
@@ -0,0 +1,105 @@
+jest.mock("../../services/certificatesAPI");
+
+import {
+  act,
+  cleanup,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from "@testing-library/react";
+import { useState } from "react";
+
+import {
+  CertificateProvider,
+  useCertificateContext,
+} from "./CertificateContext";
+
+describe("CertificateContext", () => {
+  beforeEach(() => {
+    const TestComp = () => {
+      const { createCert } = useCertificateContext();
+      const [result, setResult] = useState(null);
+      const testCreate = async (data) => {
+        const x = await createCert(data);
+        setResult(JSON.stringify(x));
+      };
+
+      return (
+        <>
+          <div data-testid="output">{result}</div>
+          <button
+            data-testid="createCertTBOX"
+            onClick={async () => {
+              await testCreate({
+                common_name: "11111111111111111",
+                type: "TBOX",
+              });
+            }}
+          />
+          <button
+            data-testid="createCertICC"
+            onClick={async () => {
+              await testCreate({
+                common_name: "11111111111111111",
+                type: "ICC",
+              });
+            }}
+          />
+          <button
+            data-testid="createCertAftersales"
+            onClick={async () => {
+              await testCreate({
+                common_name: "11111111111111112",
+                type: "Aftersales",
+              });
+            }}
+          />
+        </>
+      );
+    };
+
+    render(
+      <CertificateProvider>
+        <TestComp />
+      </CertificateProvider>
+    );
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  it("TBOX certificate", async () => {
+    await act(async () => {
+      fireEvent.click(screen.getByTestId("createCertTBOX"));
+      await waitFor(() =>
+        expect(screen.getByTestId("output").innerHTML).toBe(
+          '{"private_key":"-----BEGIN RSA PRIVATE KEY-----DATA-----END RSA PRIVATE KEY-----","public_key":"-----BEGIN CERTIFICATE-----DATA-----END CERTIFICATE-----","serial_number":"00:76:d2:ca:86:35:8c:88:52:fd:94:8e:55:d3:b6:a8:2e:73:68:00","type":"TBOX"}'
+        )
+      );
+    });
+  });
+
+  it("ICC certificate", async () => {
+    await act(async () => {
+      fireEvent.click(screen.getByTestId("createCertICC"));
+      await waitFor(() =>
+        expect(screen.getByTestId("output").innerHTML).toBe(
+          '{"private_key":"-----BEGIN RSA PRIVATE KEY-----DATA-----END RSA PRIVATE KEY-----","public_key":"-----BEGIN CERTIFICATE-----DATA-----END CERTIFICATE-----","serial_number":"00:76:d2:ca:86:35:8c:88:52:fd:94:8e:55:d3:b6:a8:2e:73:68:00","type":"ICC"}'
+        )
+      );
+    });
+  });
+
+  it("Aftersales certificate", async () => {
+    await act(async () => {
+      fireEvent.click(screen.getByTestId("createCertAftersales"));
+      await waitFor(() =>
+        expect(screen.getByTestId("output").innerHTML).toBe(
+          '{"private_key":"-----BEGIN RSA PRIVATE KEY-----DATA-----END RSA PRIVATE KEY-----","public_key":"-----BEGIN CERTIFICATE-----DATA-----END CERTIFICATE-----","serial_number":"00:76:d2:ca:86:35:8c:88:52:fd:94:8e:55:d3:b6:a8:2e:73:68:00","type":"Aftersales"}'
+        )
+      );
+    });
+  });
+});
diff --git a/src/services/__mocks__/certificatesAPI.js b/src/services/__mocks__/certificatesAPI.js
new file mode 100644
index 0000000..27c2557
--- /dev/null
+++ b/src/services/__mocks__/certificatesAPI.js
@@ -0,0 +1,13 @@
+const success = {
+  private_key:
+    "-----BEGIN RSA PRIVATE KEY-----DATA-----END RSA PRIVATE KEY-----",
+  public_key: "-----BEGIN CERTIFICATE-----DATA-----END CERTIFICATE-----",
+  serial_number: "00:76:d2:ca:86:35:8c:88:52:fd:94:8e:55:d3:b6:a8:2e:73:68:00",
+};
+
+const certificatesAPI = {
+  create: (data) => Object.assign(success, { type: data.type }),
+  createAftersales: (data) => Object.assign(success, { type: data.type }),
+};
+
+export default certificatesAPI;
diff --git a/src/utils/certificates.js b/src/utils/certificates.js
new file mode 100644
index 0000000..8455a1f
--- /dev/null
+++ b/src/utils/certificates.js
@@ -0,0 +1,29 @@
+export const CertTypes = {
+  TBOX: "TBOX",
+  ICC: "ICC",
+  Charging: "Charging",
+  Aftersales: "Aftersales",
+};
+
+export const CertTypeData = [
+  {
+    value: CertTypes.TBOX,
+    label: "TBOX",
+    inputlabel: "VIN",
+  },
+  {
+    value: CertTypes.ICC,
+    label: "ICC",
+    inputlabel: "VIN",
+  },
+  {
+    value: CertTypes.Aftersales,
+    label: "Aftersales",
+    inputlabel: "Service Tool ID",
+  },
+  {
+    value: CertTypes.Charging,
+    label: "Charging",
+    inputlabel: "VIN",
+  },
+];