diff --git a/package-lock.json b/package-lock.json
index 26858e5..38b9763 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.5.44",
+  "version": "2.6.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.5.44",
+      "version": "2.6.1",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
diff --git a/package.json b/package.json
index 813dbef..f5b189b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.5.44",
+  "version": "2.6.1",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
diff --git a/src/components/ConfigureModal/index.js b/src/components/ConfigureModal/index.js
index cd62ac8..5375714 100644
--- a/src/components/ConfigureModal/index.js
+++ b/src/components/ConfigureModal/index.js
@@ -1,4 +1,5 @@
 import {
+  CAlert,
   CButton,
   CModal,
   CModalHeader,
@@ -100,8 +101,14 @@ const ConfigureModal = ({ show, toggleModal }) => {
         });
         toggleModal();
       })
-      .catch(() => {
+      .catch((e) => {
         setResponseBody('Error while submitting command!');
+        addToast({
+          title: t('common.error'),
+          body: `${t('common.general_error')}: ${e.response?.data?.ErrorDescription}`,
+          color: 'danger',
+          autohide: true,
+        });
         setHadFailure(true);
       })
       .finally(() => {
@@ -196,11 +203,9 @@ const ConfigureModal = ({ show, toggleModal }) => {
                 />
               </CCol>
             </CRow>
-            <div hidden={!hadSuccess && !hadFailure}>
-              <div>
-                <pre className="ignore">{responseBody}</pre>
-              </div>
-            </div>
+            <CAlert color="danger" hidden={!hadSuccess && !hadFailure}>
+              {responseBody}
+            </CAlert>
           </CModalBody>
           <CModalFooter>
             <div hidden={!checkingIfSure}>Are you sure?</div>
diff --git a/src/components/WifiScanModal/index.js b/src/components/WifiScanModal/index.js
index 4aee77e..41900aa 100644
--- a/src/components/WifiScanModal/index.js
+++ b/src/components/WifiScanModal/index.js
@@ -11,6 +11,7 @@ import {
   CCol,
   CSpinner,
   CPopover,
+  CSelect,
 } from '@coreui/react';
 import CIcon from '@coreui/icons-react';
 import { cilCloudDownload, cilGauge, cilX } from '@coreui/icons';
@@ -34,6 +35,7 @@ const WifiScanModal = ({ show, toggleModal }) => {
   const [errorCode, setErrorCode] = useState(0);
   const [waiting, setWaiting] = useState(false);
   const [dfs, setDfs] = useState(true);
+  const [bandwidth, setBandwidth] = useState('');
   const [activeScan, setActiveScan] = useState(false);
   const [hideOptions, setHideOptions] = useState(false);
   const [channelList, setChannelList] = useState([]);
@@ -53,6 +55,7 @@ const WifiScanModal = ({ show, toggleModal }) => {
     setWaiting(false);
     setChannelList([]);
     setCsvData(null);
+    setBandwidth('');
     setDfs(true);
     setActiveScan(false);
     setHideOptions(false);
@@ -135,6 +138,7 @@ const WifiScanModal = ({ show, toggleModal }) => {
     const parameters = {
       serialNumber: deviceSerialNumber,
       override_dfs: dfs,
+      bandwidth: bandwidth !== '' ? bandwidth : undefined,
       activeScan,
     };
     const headers = {
@@ -246,6 +250,26 @@ const WifiScanModal = ({ show, toggleModal }) => {
               </CForm>
             </CCol>
           </CRow>
+          <CRow className="mt-3">
+            <CCol md="3">
+              <p className="pl-2">Bandwidth:</p>
+            </CCol>
+            <CCol>
+              <CForm className="pl-4">
+                <CSelect
+                  custom
+                  value={bandwidth}
+                  onChange={(e) => setBandwidth(e.target.value)}
+                  style={{ width: '100px' }}
+                >
+                  <option value="">Default</option>
+                  <option value="20">20 MHz</option>
+                  <option value="40">40 MHz</option>
+                  <option value="80">80 MHz</option>
+                </CSelect>
+              </CForm>
+            </CCol>
+          </CRow>
         </div>
         <div hidden={!waiting}>
           <CRow>