diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.styled.ts b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.styled.ts
index de24f33704..8da460ea0f 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.styled.ts
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.styled.ts
@@ -84,7 +84,7 @@ const StyledInputGroup = styled.div`
     gap: 8px;
     margin: 4px 0;
 
-    .logo {
+    .client-logo {
       max-width: 32px;
       max-height: 32px;
       width: 32px;
diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/BasicBlock.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/BasicBlock.tsx
index 1069bacbc2..920f10f0ff 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/BasicBlock.tsx
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/BasicBlock.tsx
@@ -20,6 +20,41 @@ interface BasicBlockProps {
   errorFields: string[];
 }
 
+function getImageDimensions(
+  image: any
+): Promise<{ width: number; height: number }> {
+  return new Promise((resolve, reject) => {
+    image.onload = function (e: any) {
+      const width = this.width;
+      const height = this.height;
+      resolve({ height, width });
+    };
+  });
+}
+
+function compressImage(
+  image: HTMLImageElement,
+  scale: number,
+  initalWidth: number,
+  initalHeight: number
+): any {
+  return new Promise((resolve, reject) => {
+    const canvas = document.createElement("canvas");
+
+    canvas.width = scale * initalWidth;
+    canvas.height = scale * initalHeight;
+
+    const ctx = canvas.getContext("2d");
+    if (ctx) {
+      ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
+
+      ctx.canvas.toBlob((blob) => {
+        resolve(blob);
+      }, "image/png");
+    }
+  });
+}
+
 const BasicBlock = ({
   t,
   nameValue,
@@ -37,13 +72,43 @@ const BasicBlock = ({
     changeValue(target.name, target.value);
   };
 
-  const onSelect = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const onSelect = async (e: React.ChangeEvent<HTMLInputElement>) => {
     const file =
       e.target.files && e.target.files?.length > 0 && e.target.files[0];
 
     if (file) {
+      const imgEl = document.getElementsByClassName(
+        "client-logo"
+      )[0] as HTMLImageElement;
+
+      imgEl.src = URL.createObjectURL(file);
+
+      const { height, width } = await getImageDimensions(imgEl);
+
+      const MAX_WIDTH = 32; //if we resize by width, this is the max width of compressed image
+      const MAX_HEIGHT = 32; //if we resize by height, this is the max height of the compressed image
+
+      const widthRatioBlob = await compressImage(
+        imgEl,
+        MAX_WIDTH / width,
+        width,
+        height
+      );
+      const heightRatioBlob = await compressImage(
+        imgEl,
+        MAX_HEIGHT / height,
+        width,
+        height
+      );
+
+      //pick the smaller blob between both
+      const compressedBlob =
+        widthRatioBlob.size > heightRatioBlob.size
+          ? heightRatioBlob
+          : widthRatioBlob;
+
       const reader = new FileReader();
-      reader.readAsDataURL(file);
+      reader.readAsDataURL(compressedBlob);
 
       reader.onload = () => {
         const result = reader.result as string;
diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/SelectGroup.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/SelectGroup.tsx
index 491a17d143..03eb8b6a6c 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/SelectGroup.tsx
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/components/SelectGroup.tsx
@@ -60,7 +60,11 @@ const SelectGroup = ({
         </Text>
       </div>
       <div className="select">
-        {value && <img className="logo" src={value} />}
+        <img
+          className="client-logo"
+          style={{ display: !!value ? "block" : "none" }}
+          src={value}
+        />
         <SelectorAddButton onClick={onClick} />
         <Text
           fontSize={"13px"}
diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/index.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/index.tsx
index cb323049a8..7f9e29825f 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/index.tsx
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/index.tsx
@@ -239,7 +239,7 @@ const ClientForm = ({
 
           break;
         case "description":
-          isValid = isValid && !!form[key];
+          // isValid = isValid && !!form[key];
 
           break;
         case "website_url":