diff --git a/client/src/components/jobs-available-table/jobs-available-table.component.jsx b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
index e4eef2445..d45556ba1 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.component.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
@@ -5,30 +5,21 @@ import {
   SyncOutlined,
 } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import {
-  Alert,
-  Button,
-  Card,
-  Input,
-  notification,
-  Space,
-  Table,
-  Tag,
-} from "antd";
+import { Alert, Button, Card, Input, notification, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import {
   DELETE_ALL_AVAILABLE_JOBS,
   DELETE_AVAILABLE_JOB,
 } from "../../graphql/available-jobs.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 9f38fb4ff..51675656e 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -267,19 +267,6 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Select mode="tags" />
         </Form.Item>
-        <Form.Item
-          name={["md_classes"]}
-          label={t("bodyshop.fields.md_classes")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-              type: "array",
-            },
-          ]}
-        >
-          <Select mode="tags" />
-        </Form.Item>
         <Form.Item
           name={["enforce_class"]}
           label={t("bodyshop.fields.enforce_class")}
@@ -287,6 +274,22 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["md_classes"]}
+          label={t("bodyshop.fields.md_classes")}
+          dependencies={["enforce_class"]}
+          rules={[
+            ({ getFieldValue }) => {
+              return {
+                required: getFieldValue("enforce_class"),
+                //message: t("general.validation.required"),
+                type: "array",
+              };
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")}>
         <Form.Item