diff --git a/src/ui/components/tenants/tenantDetail/deleteTenant/DeleteTenant.tsx b/src/ui/components/tenants/tenantDetail/deleteTenant/DeleteTenant.tsx
index e6e8d20b..60176daa 100644
--- a/src/ui/components/tenants/tenantDetail/deleteTenant/DeleteTenant.tsx
+++ b/src/ui/components/tenants/tenantDetail/deleteTenant/DeleteTenant.tsx
@@ -62,13 +62,16 @@ export const DeleteTenantDialog = ({
 			onCloseDialog={onCloseDialog}>
 			<DialogContent>
 				<p className="confirm-text">
-					Are you sure you want to delete the tenant: <span className="tenant-id">{tenantId}</span>? All the
-					users associated with the tenant will be moved to the public tenant. Please enter the tenantId below
-					to confirm.
+					Are you sure you want to delete the tenant: <span className="tenant-id">{tenantId}</span> ?
+					<br />
+					Users associated with the tenant will be moved to the public tenant.
+					<br />
+					<br />
+					Please enter the <span className="tenant-id">{tenantId}</span> below to confirm.
 				</p>
 				<InputField
-					label="Tenant ID"
 					value={currentTenantId}
+					placeholder={tenantId}
 					type="text"
 					name="tenantId"
 					handleChange={(e) => setCurrentTenantId(e.target.value)}
diff --git a/src/ui/components/tenants/tenantDetail/editCoreConfigPropertyDialog/EditCoreConfigPropertyDialog.tsx b/src/ui/components/tenants/tenantDetail/editCoreConfigPropertyDialog/EditCoreConfigPropertyDialog.tsx
index 96810066..d7ed6a2a 100644
--- a/src/ui/components/tenants/tenantDetail/editCoreConfigPropertyDialog/EditCoreConfigPropertyDialog.tsx
+++ b/src/ui/components/tenants/tenantDetail/editCoreConfigPropertyDialog/EditCoreConfigPropertyDialog.tsx
@@ -62,7 +62,9 @@ export const EditCoreConfigPropertyDialog = ({
 	const handleSaveProperty = async () => {
 		try {
 			setIsLoading(true);
-			const res = await updateCoreConfig(tenantInfo.tenantId, name, currentValue);
+			const parsedValue =
+				type === "number" && typeof currentValue === "string" ? parseInt(currentValue) : currentValue;
+			const res = await updateCoreConfig(tenantInfo.tenantId, name, parsedValue);
 			if (res.status !== "OK") {
 				if (res.status === "UNKNOWN_TENANT_ERROR") {
 					showToast({
@@ -94,7 +96,7 @@ export const EditCoreConfigPropertyDialog = ({
 
 	return (
 		<Dialog
-			title="Edit Property?"
+			title="Edit Property"
 			onCloseDialog={onCloseDialog}>
 			<DialogContent>
 				<div>