diff --git a/src/pages/Dashboard/FeedbackModal.tsx b/src/pages/Dashboard/FeedbackModal.tsx
index c3ad6e1de..594ac55cf 100644
--- a/src/pages/Dashboard/FeedbackModal.tsx
+++ b/src/pages/Dashboard/FeedbackModal.tsx
@@ -1,17 +1,17 @@
 import { Button, Modal, ModalBody } from "@appquality/appquality-design-system";
 import { ChatLeftDots } from "react-bootstrap-icons";
 import { useTranslation } from "react-i18next";
+import { useGetUsersMeQuery } from "src/services/tryberApi";
 import styled from "styled-components";
 
 export const FeedbackModal = ({
   open = true,
   onClose,
-  user,
 }: {
   open?: boolean;
   onClose: () => void;
-  user?: UserData;
 }) => {
+  const { data: user, isLoading } = useGetUsersMeQuery({ fields: "id,email" });
   const { t } = useTranslation();
 
   const iFrameStyle = {
@@ -20,10 +20,13 @@ export const FeedbackModal = ({
     minHeight: "400px",
     border: "none",
   };
+
+  if (isLoading) return null;
   return (
     <Modal isOpen={open} onClose={onClose} title={t("Send us your feedback!")}>
       <ModalBody>
         <iframe
+          title="Feedback form"
           src={`https://form.jotform.com/213364740407351?testerId=T${user?.id}&email=${user?.email}`}
           style={iFrameStyle}
         />
diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx
index d5684494d..b0e7ebae1 100644
--- a/src/pages/Dashboard/index.tsx
+++ b/src/pages/Dashboard/index.tsx
@@ -78,7 +78,6 @@ export default function Dashboard() {
             <FeedbackModal
               onClose={() => setFeedbackModalOpen(false)}
               open={isFeedbackModalOpen}
-              user={user}
             />
             <FeedbackButton handleClick={() => setFeedbackModalOpen(true)} />
           </>
diff --git a/src/pages/Profile/TabFiscal/TabFiscalEdit.tsx b/src/pages/Profile/TabFiscal/TabFiscalEdit.tsx
index b1f39ba2b..16077a49d 100644
--- a/src/pages/Profile/TabFiscal/TabFiscalEdit.tsx
+++ b/src/pages/Profile/TabFiscal/TabFiscalEdit.tsx
@@ -206,7 +206,7 @@ export const TabFiscalEdit = ({ setEdit, inputRef }: TabCommonProps) => {
         helpers.resetForm({ values });
       }}
     >
-      {({ isValid, isValidating, dirty, values, errors }) => (
+      {({ isValid, isValidating, isSubmitting, dirty, values, errors }) => (
         <Form id="fiscalProfileForm">
           <CSSGrid gutter="50px" rowGap="1rem" min="220px">
             <div className="user-info">
@@ -354,7 +354,7 @@ export const TabFiscalEdit = ({ setEdit, inputRef }: TabCommonProps) => {
                   kind="primary"
                   type="submit"
                   flat
-                  disabled={!isValid || isValidating || !dirty}
+                  disabled={!isValid || isValidating || !dirty || isSubmitting}
                 >
                   {t("Save")}
                 </HalfColumnButton>