diff --git a/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx b/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
index 3d1ef074d..c9953a3e7 100644
--- a/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
+++ b/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
@@ -3,10 +3,7 @@ import { Select } from "antd";
 import { useTranslation } from "react-i18next";
 const { Option } = Select;
 
-const CourtesyCarStatusComponent = (
-  { value = "courtesycars.status.in", onChange },
-  ref
-) => {
+const CourtesyCarStatusComponent = ({ value, onChange }, ref) => {
   const [option, setOption] = useState(value);
   const { t } = useTranslation();
 
diff --git a/client/src/pages/courtesy-car-create/courtesy-car-create.page.component.jsx b/client/src/pages/courtesy-car-create/courtesy-car-create.page.component.jsx
deleted file mode 100644
index 43aa539d3..000000000
--- a/client/src/pages/courtesy-car-create/courtesy-car-create.page.component.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from "react";
-import CourtesyCarFormComponent from "../../components/courtesy-car-form/courtesy-car-form.component";
-
-export default function CourtesyCarCreateComponent({ form }) {
-  return <CourtesyCarFormComponent form={form} />;
-}
diff --git a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
index d04e1feb0..fb7db2f81 100644
--- a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
+++ b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
@@ -6,7 +6,8 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_COURTESY_CAR } from "../../graphql/courtesy-car.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import CourtesyCarCreateComponent from "./courtesy-car-create.page.component";
+import CourtesyCarFormComponent from "../../components/courtesy-car-form/courtesy-car-form.component";
+
 import { useHistory } from "react-router-dom";
 import {
   setBreadcrumbs,
@@ -31,17 +32,17 @@ export function CourtesyCarCreateContainer({
   const { t } = useTranslation();
   const history = useHistory();
 
-  const handleFinish = (values) => {
-    insertCourtesyCar({
+  const handleFinish = async (values) => {
+    const result = await insertCourtesyCar({
       variables: { courtesycar: { ...values, bodyshopid: bodyshop.id } },
-    })
-      .then((response) => {
-        notification["success"]({ message: t("courtesycars.successes.saved") });
-        history.push(
-          `/manage/courtesycars/${response.data.insert_courtesycars.returning[0].id}`
-        );
-      })
-      .catch((error) => console.log("error", error));
+    });
+
+    notification["success"]({ message: t("courtesycars.successes.saved") });
+    history.push(
+      `/manage/courtesycars/${result.data.insert_courtesycars.returning[0].id}`
+    );
+
+    console.log("error");
   };
 
   useEffect(() => {
@@ -59,7 +60,7 @@ export function CourtesyCarCreateContainer({
   return (
     <RbacWrapper action="courtesycar:create">
       <Form form={form} autoComplete="new-password" onFinish={handleFinish}>
-        <CourtesyCarCreateComponent form={form} />
+        <CourtesyCarFormComponent form={form} />
       </Form>
     </RbacWrapper>
   );