diff --git a/src/interface/web/app/components/agentCard/agentCard.tsx b/src/interface/web/app/components/agentCard/agentCard.tsx
index 57fa5054..87ce30d2 100644
--- a/src/interface/web/app/components/agentCard/agentCard.tsx
+++ b/src/interface/web/app/components/agentCard/agentCard.tsx
@@ -652,6 +652,7 @@ export function AgentModificationForm(props: AgentModificationFormProps) {
     };
 
     const handleSubmit = (values: any) => {
+        console.log("Submitting", values);
         props.onSubmit(values);
         setIsSaving(true);
     };
@@ -1335,6 +1336,7 @@ export function AgentModificationForm(props: AgentModificationFormProps) {
                         type="submit"
                         variant={"outline"}
                         disabled={isSaving}
+                        onClick={props.form.handleSubmit(handleSubmit)}
                         className={`items-center ${isSaving ? "bg-stone-100 dark:bg-neutral-900" : ""} text-white ${colorOptionClassName}`}
                     >
                         <FloppyDisk className="h-4 w-4 mr-2" />
diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py
index c77b9443..4e458651 100644
--- a/src/khoj/routers/helpers.py
+++ b/src/khoj/routers/helpers.py
@@ -325,7 +325,7 @@ async def acheck_if_safe_prompt(system_prompt: str, user: KhojUser = None, lax:
 
         response = response.strip()
         try:
-            response = json.loads(response)
+            response = clean_json(response)
             is_safe = response.get("safe", "True") == "True"
             if not is_safe:
                 reason = response.get("reason", "")