diff --git a/components/InputForm.tsx b/components/InputForm.tsx
index aeac7a7..9263474 100644
--- a/components/InputForm.tsx
+++ b/components/InputForm.tsx
@@ -69,7 +69,7 @@ const scopesInfo: ScopeInfo[] = [
   },
   {
     method: "crypto",
-    label: "Crypto",
+    label:  "Crypto",
     description: "use end-to-end encryption",
   },
 ];
@@ -89,6 +89,7 @@ const InputForm = () => {
       instance: "https://",
       clientName: "",
       redirectUris: "",
+      scopes:[]
     },
   });
 
diff --git a/components/ScopeItem.tsx b/components/ScopeItem.tsx
index 7d91d49..4237201 100644
--- a/components/ScopeItem.tsx
+++ b/components/ScopeItem.tsx
@@ -1,4 +1,4 @@
-'use client'
+"use client";
 
 import { MethodType } from "./InputForm";
 import { Checkbox } from "@/components/ui/checkbox";
@@ -6,15 +6,28 @@ import { Checkbox } from "@/components/ui/checkbox";
 interface ScopeCheckboxProps {
   scope: string;
   method: MethodType;
+  field: any;
 }
 
-const ScopeItem: React.FC<ScopeCheckboxProps> = ({ scope, method }) => {
+const ScopeItem: React.FC<ScopeCheckboxProps> = ({ scope, method, field }) => {
+
+
   return (
     <div className={`items-top flex space-x-2 hover:cursor-pointer`}>
-      <Checkbox id={`${scope}`} />
+      <Checkbox
+        id={scope}
+        checked={field.value?.includes(scope)}
+        onCheckedChange={(checked) => {
+          return checked
+            ? field.onChange([...field.value, scope])
+            : field.onChange(
+              field.value?.filter((value: string) => value !== scope)
+            );
+        }}
+      />
       <div className="grid gap-1.5 leading-none">
         <label
-          htmlFor={`${scope}`}
+          htmlFor={scope}
           className="text-sm font-medium leading-none hover:cursor-pointer peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
         >
           {method == "admin" && (
@@ -27,4 +40,4 @@ const ScopeItem: React.FC<ScopeCheckboxProps> = ({ scope, method }) => {
   );
 };
 
-export default ScopeItem;
\ No newline at end of file
+export default ScopeItem;
diff --git a/components/ScopeSection.tsx b/components/ScopeSection.tsx
index f2b049d..9267a98 100644
--- a/components/ScopeSection.tsx
+++ b/components/ScopeSection.tsx
@@ -19,11 +19,22 @@ interface ScopeSectionProps {
 const ScopeSection: React.FC<ScopeSectionProps> = ({ info, field }) => {
   const { method, description, scopes, label } = info;
 
+  console.log(field);
   return (
     <Collapsible className="flex flex-col rounded-md bg-slate-50 px-4 py-3">
       <div className="flex justify-between">
         <div className="items-top flex space-x-2 ">
-          <Checkbox id={method} />
+          <Checkbox
+            id={method}
+            checked={field.value?.includes(method)}
+            onCheckedChange={(checked) => {
+              return checked
+                ? field.onChange([...field.value, method])
+                : field.onChange(
+                    field.value?.filter((value: string) => value !== method)
+                  );
+            }}
+          />
           <div className="grid gap-1.5 leading-none">
             <label
               htmlFor={method}
@@ -54,15 +65,25 @@ const ScopeSection: React.FC<ScopeSectionProps> = ({ info, field }) => {
               ? (scopes as string[][]).map((items) => (
                   <div
                     key={`${items}${method}`}
-                    className="flex flex-col gap-2"
+                    className="mb-2 flex flex-col gap-2 md:mb-0"
                   >
                     {items.map((item) => (
-                      <ScopeItem scope={item} key={item} method={method} />
+                      <ScopeItem
+                        scope={item}
+                        key={item}
+                        method={method}
+                        field={field}
+                      />
                     ))}
                   </div>
                 ))
               : (scopes as string[]).map((scope) => (
-                  <ScopeItem scope={scope} key={scope} method={method} />
+                  <ScopeItem
+                    scope={scope}
+                    key={scope}
+                    method={method}
+                    field={field}
+                  />
                 ))}
           </div>
         </CollapsibleContent>