diff --git a/src/components/UserAccountData.tsx b/src/components/UserAccountData.tsx
index f167239..01dd0db 100644
--- a/src/components/UserAccountData.tsx
+++ b/src/components/UserAccountData.tsx
@@ -40,7 +40,7 @@ const UserAccountData = () => {
     <>
       <Stack direction="column" spacing={2} width="100%">
         <Typography variant="h6">{translate("resources.users.account_data.title")}</Typography>
-        <Typography variant="body1">
+        <Typography variant="body1" component="div">
           <Box>
             <Accordion>
               <AccordionSummary expandIcon={<ArrowDownwardIcon />}>
diff --git a/src/components/UserRateLimits.tsx b/src/components/UserRateLimits.tsx
index ac1fe7d..6e32a16 100644
--- a/src/components/UserRateLimits.tsx
+++ b/src/components/UserRateLimits.tsx
@@ -33,7 +33,6 @@ const RateLimitRow = ({
       }}
     >
       <TextField
-        id="outlined-number"
         type="number"
         value={value}
         onChange={handleChange}
diff --git a/src/pages/LoginPage.tsx b/src/pages/LoginPage.tsx
index 5ac3f39..5886f4b 100644
--- a/src/pages/LoginPage.tsx
+++ b/src/pages/LoginPage.tsx
@@ -185,7 +185,6 @@ const LoginPage = () => {
     }
   };
 
-
   const UserData = ({ formData }) => {
     const form = useFormContext();
 
@@ -197,17 +196,17 @@ const LoginPage = () => {
       const domain = splitMxid(formData.username)?.domain;
       if (domain) {
         const url = await getWellKnownUrl(domain);
-          if (allowAnyBaseUrl || (allowMultipleBaseUrls && restrictBaseUrl.includes(url))) {
-            form.setValue("base_url", url, {
-              shouldValidate: true,
-              shouldDirty: true,
-            });
+        if (allowAnyBaseUrl || (allowMultipleBaseUrls && restrictBaseUrl.includes(url))) {
+          form.setValue("base_url", url, {
+            shouldValidate: true,
+            shouldDirty: true,
+          });
           checkServerInfo(url);
         }
       }
     };
 
-    const handleBaseUrlBlurOrChange = (event) => {
+    const handleBaseUrlBlurOrChange = event => {
       // Get the value either from the event (onChange) or from formData (onBlur)
       const value = event?.target?.value || formData.base_url;
 
@@ -318,16 +317,17 @@ const LoginPage = () => {
               choices={baseUrlChoices}
             />
           )}
-          {!allowMultipleBaseUrls && (<TextInput
-            source="base_url"
-            label="synapseadmin.auth.base_url"
-            autoComplete="url"
-            {...(loading ? { disabled: true } : {})}
-            readOnly={allowSingleBaseUrl}
-            resettable={allowAnyBaseUrl}
-            validate={[required(), validateBaseUrl]}
-            onBlur={handleBaseUrlBlurOrChange}
-           />
+          {!allowMultipleBaseUrls && (
+            <TextInput
+              source="base_url"
+              label="synapseadmin.auth.base_url"
+              autoComplete="url"
+              {...(loading ? { disabled: true } : {})}
+              readOnly={allowSingleBaseUrl}
+              resettable={allowAnyBaseUrl}
+              validate={[required(), validateBaseUrl]}
+              onBlur={handleBaseUrlBlurOrChange}
+            />
           )}
         </Box>
         <Typography className="serverVersion">{serverVersion}</Typography>
diff --git a/src/resources/users.tsx b/src/resources/users.tsx
index 4c73583..198f43e 100644
--- a/src/resources/users.tsx
+++ b/src/resources/users.tsx
@@ -115,7 +115,8 @@ const userFilters = [
   <BooleanInput source="guests" alwaysOn />,
   <BooleanInput label="resources.users.fields.show_deactivated" source="deactivated" alwaysOn />,
   <BooleanInput label="resources.users.fields.show_locked" source="locked" alwaysOn />,
-  <BooleanInput label="resources.users.fields.show_suspended" source="suspended" alwaysOn />,
+  // waiting for https://github.com/element-hq/synapse/issues/18016
+  // <BooleanInput label="resources.users.fields.show_suspended" source="suspended" alwaysOn />,
 ];
 
 const UserPreventSelfDelete: React.FC<{
@@ -208,7 +209,6 @@ export const UserList = (props: ListProps) => (
       <BooleanField source="admin" label="resources.users.fields.admin" />
       <BooleanField source="deactivated" label="resources.users.fields.deactivated" />
       <BooleanField source="locked" label="resources.users.fields.locked" />
-      <BooleanField source="suspended" label="resources.users.fields.suspended" />
       <BooleanField source="erased" sortable={false} label="resources.users.fields.erased" />
       <DateField source="creation_ts" label="resources.users.fields.creation_ts_ms" showTime options={DATE_FORMAT} />
     </DatagridConfigurable>
diff --git a/src/synapse/dataProvider.ts b/src/synapse/dataProvider.ts
index 8b0deee..bb6c0f9 100644
--- a/src/synapse/dataProvider.ts
+++ b/src/synapse/dataProvider.ts
@@ -348,6 +348,10 @@ export interface SynapseDataProvider extends DataProvider {
   getAccountData: (id: Identifier) => Promise<AccountDataModel>;
   checkUsernameAvailability: (username: string) => Promise<UsernameAvailabilityResult>;
   makeRoomAdmin: (room_id: string, user_id: string) => Promise<{ success: boolean; error?: string; errcode?: string }>;
+  suspendUser: (
+    id: Identifier,
+    suspendValue: boolean
+  ) => Promise<{ success: boolean; error?: string; errcode?: string }>;
   getServerRunningProcess: (etkeAdminUrl: string) => Promise<ServerProcessResponse>;
   getServerStatus: (etkeAdminUrl: string) => Promise<ServerStatusResponse>;
   getServerNotifications: (etkeAdminUrl: string) => Promise<ServerNotificationsResponse>;
@@ -782,6 +786,7 @@ const baseDataProvider: SynapseDataProvider = {
     const res = resourceMap[resource];
 
     const endpoint_url = homeserver + res.path;
+
     const { json } = await jsonClient(`${endpoint_url}/${encodeURIComponent(params.id)}`, {
       method: "PUT",
       body: JSON.stringify(params.data, filterNullValues),
@@ -1026,6 +1031,22 @@ const baseDataProvider: SynapseDataProvider = {
       throw error;
     }
   },
+  suspendUser: async (id: Identifier, suspendValue: boolean) => {
+    const base_url = localStorage.getItem("base_url");
+    const endpoint_url = `${base_url}/_synapse/admin/v1/suspend/${encodeURIComponent(returnMXID(id))}`;
+    try {
+      const { json } = await jsonClient(endpoint_url, {
+        method: "PUT",
+        body: JSON.stringify({ suspend: suspendValue }),
+      });
+      return { success: true };
+    } catch (error) {
+      if (error instanceof HttpError) {
+        return { success: false, error: error.body.error, errcode: error.body.errcode };
+      }
+      throw error;
+    }
+  },
   getServerRunningProcess: async (etkeAdminUrl: string, burstCache = false): Promise<ServerProcessResponse> => {
     const locked_at = "";
     const command = "";
@@ -1427,12 +1448,18 @@ const dataProvider = withLifecycleCallbacks(baseDataProvider, [
       const avatarFile = params.data.avatar_file?.rawFile;
       const avatarErase = params.data.avatar_erase;
       const rates = params.data.rates;
+      const suspended = params.data.suspended;
 
       if (rates) {
         await dataProvider.setRateLimits(params.id, rates);
         delete params.data.rates;
       }
 
+      if (suspended !== undefined) {
+        await (dataProvider as SynapseDataProvider).suspendUser(params.id, suspended);
+        delete params.data.suspended;
+      }
+
       if (avatarErase) {
         params.data.avatar_url = "";
         return params;