diff --git a/src/components/FormComponents/DOIInput.jsx b/src/components/FormComponents/DOIInput.jsx
index 6ad4f9a1..245f96dc 100644
--- a/src/components/FormComponents/DOIInput.jsx
+++ b/src/components/FormComponents/DOIInput.jsx
@@ -15,7 +15,6 @@ import { En, Fr, I18n } from "../I18n";
 import firebase from "../../firebase";
 import recordToDataCite from "../../utils/recordToDataCite";
 import { validateDOI } from "../../utils/validate";
-import { getDatacitePrefix, getAuthHash } from "../../utils/firebaseEnableDoiCreation";
 
 import {
     QuestionText,
@@ -23,17 +22,14 @@ import {
     paperClass,
 } from "./QuestionStyles";
 
-// import regions from "../../regions";
 import { UserContext } from "../../providers/UserProvider";
+import performUpdateDraftDoi from "../../utils/doiUpdate";
 
 
 const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoiCreationStatus, disabled }) => {
-    const { createDraftDoi, updateDraftDoi, deleteDraftDoi, getDoiStatus } = useContext(UserContext);
+    const { createDraftDoi, deleteDraftDoi, getDoiStatus, datacitePrefix, dataciteAuthHash } = useContext(UserContext);
     const { language, region, userID } = useParams();
-    // const regionInfo = regions[region];
     const doiIsValid = validateDOI(record.datasetIdentifier)
-
-    // const languageUpperCase = language.toUpperCase();
     const [doiGenerated, setDoiGenerated] = useState(false);
     const [doiErrorFlag, setDoiErrorFlag] = useState(false);
     const [debouncedDoiIdValue] = useDebounce(record.datasetIdentifier, 1000);
@@ -41,16 +37,12 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
     const [loadingDoiUpdate, setLoadingDoiUpdate] = useState(false);
     const [loadingDoiDelete, setLoadingDoiDelete] = useState(false);
     const [doiUpdateFlag, setDoiUpdateFlag] = useState(false);
-    const [datacitePrefix, setDatacitePrefix] = useState('');
-    const [loadingPrefix, setLoadingPrefix] = useState(true);
-    const [dataciteAuthHash, setDataciteAuthHash] = useState('');
-    const [loadingAuthHash, setLoadingAuthHash] = useState(true);
 
     const generateDoiDisabled = doiGenerated || loadingDoi || (record.doiCreationStatus !== "" || record.recordID === "");
-    const showGenerateDoi = !loadingPrefix && Boolean(datacitePrefix);
-    const showDoiStatus = doiIsValid && !loadingPrefix && datacitePrefix && record.doiCreationStatus && record.doiCreationStatus !== ""
-    const showUpdateDoi = doiIsValid && !loadingPrefix && datacitePrefix && record.doiCreationStatus !== "" && record.datasetIdentifier.includes(datacitePrefix);
-    const showDeleteDoi = doiIsValid && !loadingPrefix && datacitePrefix && record.doiCreationStatus !== "" && !doiErrorFlag && record.datasetIdentifier.includes(datacitePrefix);
+    const showGenerateDoi = Boolean(datacitePrefix);
+    const showDoiStatus = doiIsValid && datacitePrefix && record.doiCreationStatus && record.doiCreationStatus !== ""
+    const showUpdateDoi = doiIsValid && datacitePrefix && record.doiCreationStatus !== "" && record.datasetIdentifier.includes(datacitePrefix);
+    const showDeleteDoi = doiIsValid && datacitePrefix && record.doiCreationStatus !== "" && !doiErrorFlag && record.datasetIdentifier.includes(datacitePrefix);
     const mounted = useRef(false);
 
     async function handleGenerateDOI() {
@@ -59,7 +51,7 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
 
         try {
             const mappedDataCiteObject = recordToDataCite(record, language, region, datacitePrefix);
-            if (!loadingAuthHash && dataciteAuthHash) {
+            if (dataciteAuthHash) {
 
                 await createDraftDoi({
                     record: mappedDataCiteObject,
@@ -103,34 +95,23 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
         setLoadingDoiUpdate(true);
 
         try {
-            const mappedDataCiteObject = recordToDataCite(record, language, region, datacitePrefix);
-            delete mappedDataCiteObject.data.type;
-            delete mappedDataCiteObject.data.attributes.prefix;
-
-            // Extract DOI from the full URL
-            const doi = record.datasetIdentifier.replace('https://doi.org/', '');
-
-            const dataObject = {
-                doi,
-                data: mappedDataCiteObject,
-                dataciteAuthHash,
-            }
-
-            const response = await updateDraftDoi(dataObject);
-            const statusCode = response.data.status;
+            const statusCode = await performUpdateDraftDoi(record, region, language, datacitePrefix, dataciteAuthHash)
 
             if (statusCode === 200) {
                 setDoiUpdateFlag(true);
+                setDoiErrorFlag(false);
             } else {
                 setDoiErrorFlag(true);
+                setDoiUpdateFlag(false);
             }
         } catch (err) {
-            // eslint-disable-next-line no-console
-            console.error('Error updating draft DOI: ', err);
             setDoiErrorFlag(true);
             throw err;
         } finally {
             setLoadingDoiUpdate(false);
+            setTimeout(() => {
+                setDoiUpdateFlag(false);
+            }, 3000);
         }
     }
 
@@ -179,64 +160,13 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
             throw err;
         }
     }
-
-    // Fetch Datacite Prefix when component mounts or region changes
-    useEffect(() => {
-        mounted.current = true;
-        const fetchPrefix = async () => {
-            setLoadingPrefix(true);
-            try{
-                const prefix = await getDatacitePrefix(region);
-                if (mounted.current){
-                    setDatacitePrefix(prefix);
-                }
-            } catch(e){
-                if ((e.message).includes('Error: Permission denied')){
-                    // ignore
-                }
-                else{
-                    throw e
-                }                           
-            }
-            if (mounted.current) {
-                setLoadingPrefix(false);
-            }
-        };
-
-        const fetchAuthHash = async () => {
-            setLoadingAuthHash(true);
-            try {
-                const authHash = await getAuthHash(region);
-                if (mounted.current) {
-                    setDataciteAuthHash(authHash);
-                }
-            } catch (e) {
-                if ((e.message).includes('Error: Permission denied')) {
-                    // ignore
-                }
-                else {
-                    throw e
-                }
-            }
-            if (mounted.current) {
-                setLoadingAuthHash(false);
-            }
-        };
-
-        fetchPrefix();
-        fetchAuthHash();
-
-        return () => {
-            mounted.current = false;
-        };
-    }, [region]);
-
+   
     useEffect(() => {
         mounted.current = true;
         if (debouncedDoiIdValue === '') {
             handleUpdateDoiCreationStatus({ target: { name, value: "" } });
         }
-        else if (debouncedDoiIdValue && !loadingPrefix && datacitePrefix && doiIsValid && !loadingAuthHash && dataciteAuthHash) {
+        else if (debouncedDoiIdValue && datacitePrefix && doiIsValid && dataciteAuthHash) {
             let id = debouncedDoiIdValue
             if (debouncedDoiIdValue.includes('doi.org/')) {
                 id = debouncedDoiIdValue.split('doi.org/').pop();
@@ -255,7 +185,7 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
         return () => {
             mounted.current = false;
         };
-    }, [debouncedDoiIdValue, getDoiStatus, doiIsValid, datacitePrefix, loadingPrefix, dataciteAuthHash, loadingAuthHash])
+    }, [debouncedDoiIdValue, getDoiStatus, doiIsValid, datacitePrefix, dataciteAuthHash])
 
 
 
@@ -286,7 +216,7 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
             {
                 showGenerateDoi && (
                     <Button
-                        onClick={() => handleGenerateDOI}
+                        onClick={() => handleGenerateDOI()}
                         disabled={generateDoiDisabled}
                         style={{ display: "inline" }}
                     >
@@ -306,7 +236,7 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
             {
                 showUpdateDoi && (
                     <Button
-                        onClick={() => handleUpdateDraftDOI}
+                        onClick={() => handleUpdateDraftDOI()}
                         disabled={['not found', 'unknown'].includes(record.doiCreationStatus)}
                         style={{ display: 'inline' }}
                     >
@@ -326,7 +256,7 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
             {
                 showDeleteDoi && (
                     <Button
-                        onClick={() => handleDeleteDOI}
+                        onClick={() => handleDeleteDOI()}
                         disabled={record.doiCreationStatus !== 'draft'}
                         style={{ display: "inline" }}
                     >
@@ -364,7 +294,7 @@ const DOIInput = ({ record, name, handleUpdateDatasetIdentifier, handleUpdateDoi
 
             <TextField
                 style={{ marginTop: "10px" }}
-                name="datasetIdentifier"
+                name={name || "datasetIdentifier"}
                 helperText={
                     (doiIsValid ? "" : <I18n en="Invalid DOI" fr="DOI non valide" />)
                     || (showDoiStatus && <I18n en={`DOI Status: ${record.doiCreationStatus}`} fr={`Statut DOI: ${record.doiCreationStatus}`} />)
diff --git a/src/components/Pages/MetadataForm.jsx b/src/components/Pages/MetadataForm.jsx
index 89851243..8ea09593 100644
--- a/src/components/Pages/MetadataForm.jsx
+++ b/src/components/Pages/MetadataForm.jsx
@@ -101,7 +101,6 @@ const styles = (theme) => ({
 
 class MetadataForm extends FormClassTemplate {
 
-
   constructor(props) {
     super(props);
 
@@ -254,15 +253,18 @@ class MetadataForm extends FormClassTemplate {
   async handleUpdateDraftDOI() {
     const { match } = this.props;
     const { region, language } = match.params;
-    const { record } = this.state;
+    const { record} = this.state;
+    const { datacitePrefix, dataciteAuthHash } = this.context;
 
     try {
-      const statusCode = await performUpdateDraftDoi(record, region, language);
+      if (datacitePrefix && dataciteAuthHash){
+        const statusCode = await performUpdateDraftDoi(record, region, language, datacitePrefix, dataciteAuthHash);
 
       if (statusCode === 200) {
         this.state.doiUpdated = true
       } else {
         this.state.doiError = true
+        }
       }
     } catch (err) {
       // eslint-disable-next-line no-console
@@ -277,6 +279,7 @@ class MetadataForm extends FormClassTemplate {
     const { region, userID } = match.params;
     const isNewRecord = match.url.endsWith("new");
     const { record } = this.state;
+    
     // Bit of logic here to decide if this is a user submitting their own form
     // or a reviewer submitting it
     const loggedInUserID = auth.currentUser.uid;
diff --git a/src/components/Tabs/IdentificationTab.jsx b/src/components/Tabs/IdentificationTab.jsx
index 6a986c3f..214b1874 100644
--- a/src/components/Tabs/IdentificationTab.jsx
+++ b/src/components/Tabs/IdentificationTab.jsx
@@ -28,8 +28,6 @@ import {
 } from "../FormComponents/QuestionStyles";
 
 import regions from "../../regions";
-import { UserContext } from "../../providers/UserProvider";
-import performUpdateDraftDoi from "../../utils/doiUpdate";
 
 const IdentificationTab = ({
   disabled,
@@ -38,10 +36,8 @@ const IdentificationTab = ({
   updateRecord,
   projects,
 }) => {
-  const { language, region, userID } = useParams();
-  const { createDraftDoi, deleteDraftDoi, getDoiStatus } = useContext(UserContext);
+  const { language, region } = useParams();
   const regionInfo = regions[region];
-  const doiIsValid =validateDOI(record.datasetIdentifier)
 
   const languageUpperCase = language.toUpperCase();
 
@@ -63,177 +59,6 @@ const IdentificationTab = ({
     )
   );
 
-  async function handleGenerateDOI() {
-    setLoadingDoi(true);
-
-    try {
-      const mappedDataCiteObject = recordToDataCite(record, language, region, datacitePrefix);
-      if(!loadingAuthHash && dataciteAuthHash) {
-
-        await createDraftDoi({
-          record: mappedDataCiteObject,
-          authHash: dataciteAuthHash,
-        })
-        .then((response) => {
-          return response.data.data.attributes;
-        })
-        .then(async (attributes) => {
-          // Update the record object with datasetIdentifier and doiCreationStatus
-          updateRecord("datasetIdentifier")(`https://doi.org/${attributes.doi}`);
-          updateRecord("doiCreationStatus")("draft");
-
-          // Create a new object with updated properties
-          const updatedRecord = {
-            ...record,
-            datasetIdentifier: `https://doi.org/${attributes.doi}`,
-            doiCreationStatus: "draft",
-          };
-
-          // Save the updated record to the Firebase database
-          const recordsRef = firebase
-            .database()
-            .ref(region)
-            .child("users")
-            .child(userID)
-            .child("records");
-
-          if (record.recordID) {
-            await recordsRef
-              .child(record.recordID)
-              .update({ datasetIdentifier: updatedRecord.datasetIdentifier, doiCreationStatus: updatedRecord.doiCreationStatus });
-          }
-
-          setDoiGenerated(true);
-        })
-        .finally(() => {
-          setLoadingDoi(false);
-        });
-      }
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.error("Error in handleGenerateDOI:", err);
-      setDoiErrorFlag(true);
-      throw err;
-    }
-  }
-
-  async function handleUpdateDraftDOI() {
-    setLoadingDoiUpdate(true);
-
-    try {
-      const statusCode = await performUpdateDraftDoi(record, region, language)
-
-      if (statusCode === 200) {
-        setDoiUpdateFlag(true);
-      } else {
-        setDoiErrorFlag(true);
-      }
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.error('Error updating draft DOI: ', err);
-      setDoiErrorFlag(true);
-      throw err;
-    } finally {
-      setLoadingDoiUpdate(false);
-    }
-  }
-
-  async function handleDeleteDOI() {
-    setLoadingDoiDelete(true);
-
-    try {
-      // Extract DOI from the full URL
-      const doi = record.datasetIdentifier.replace('https://doi.org/', '');
-
-      deleteDraftDoi({doi, dataciteAuthHash})
-        .then((response) => response.data)
-        .then(async (statusCode) => {
-          if (statusCode === 204) {
-            // Update the record object with datasetIdentifier and doiCreationStatus
-            updateRecord("datasetIdentifier")("");
-            updateRecord("doiCreationStatus")("");
-
-            // Create a new object with updated properties
-            const updatedRecord = {
-              ...record,
-              datasetIdentifier: "",
-              doiCreationStatus: "",
-            };
-
-            // Save the updated record to the Firebase database
-            const recordsRef = firebase
-              .database()
-              .ref(region)
-              .child("users")
-              .child(userID)
-              .child("records");
-
-            if (record.recordID) {
-              await recordsRef
-                .child(record.recordID)
-                .update({ datasetIdentifier: updatedRecord.datasetIdentifier, doiCreationStatus: updatedRecord.doiCreationStatus });
-            }
-
-            setDoiGenerated(false);
-          } else {
-            setDoiErrorFlag(true);
-          }
-        })
-        .finally(() => {
-          setLoadingDoiDelete(false);
-        });
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.error(err);
-      setDoiErrorFlag(true);
-      throw err;
-    }
-  }
-
-  // Fetch Datacite Prefix when component mounts or region changes
-  useEffect(() => {
-    const fetchPrefix = async () => {
-      setLoadingPrefix(true);
-      const prefix = await getDatacitePrefix(region);
-      setDatacitePrefix(prefix);
-      setLoadingPrefix(false);
-    };
-
-    const fetchAuthHash = async () => {
-      setLoadingAuthHash(true);
-      const authHash = await getAuthHash(region);
-      setDataciteAuthHash(authHash);
-      setLoadingAuthHash(false);
-    };
-
-    fetchPrefix();
-    fetchAuthHash();
-  }, [region]);
-
-  useEffect(() => {
-    mounted.current = true;
-    if (debouncedDoiIdValue === '') {
-      updateRecord("doiCreationStatus")('')
-    }
-    else if (debouncedDoiIdValue && !loadingPrefix && datacitePrefix && doiIsValid && !loadingAuthHash && dataciteAuthHash) {
-      let id = debouncedDoiIdValue
-      if (debouncedDoiIdValue.includes('doi.org/')) {
-        id = debouncedDoiIdValue.split('doi.org/').pop();
-      }
-      getDoiStatus({ doi: id, prefix: datacitePrefix, authHash: dataciteAuthHash })
-        .then(response => {
-          updateRecord("doiCreationStatus")(response.data)
-        })
-        .catch(err => {
-          console.error(err)
-        });
-    }
-
-    return () => {
-      mounted.current = false;
-    };
-  }, [debouncedDoiIdValue, getDoiStatus, doiIsValid, updateRecord, datacitePrefix, loadingPrefix, dataciteAuthHash, loadingAuthHash])
-
   return (
     <div>
 
diff --git a/src/providers/UserProvider.jsx b/src/providers/UserProvider.jsx
index 007f91ec..1898f3f7 100644
--- a/src/providers/UserProvider.jsx
+++ b/src/providers/UserProvider.jsx
@@ -41,6 +41,21 @@ class UserProvider extends FormClassTemplate {
         });
 
         const database = getDatabase(firebase);
+        // should be replaced with getDatacitePrefix but can't as this function is not async
+        const prefixRef = ref(database, `admin/${region}/dataciteCredentials/prefix`);
+        onValue(prefixRef, (prefix) => {
+          this.setState({
+            datacitePrefix: prefix.val(),
+          });
+        });
+
+        // should be replaced with getDataciteAuthHash but can't as this function is not async
+        const authHashRef = ref(database, `admin/${region}/dataciteCredentials/dataciteHash`);
+        onValue(authHashRef, (authHash) => {
+          this.setState({
+            dataciteAuthHash: authHash.val(),
+          });
+        });
 
 
         update( ref(database, `${region}/users/${uid}/userinfo`), { displayName, email });
diff --git a/src/utils/doiUpdate.js b/src/utils/doiUpdate.js
index 0a49dd5e..e332a5d3 100644
--- a/src/utils/doiUpdate.js
+++ b/src/utils/doiUpdate.js
@@ -1,25 +1,25 @@
+import { getFunctions, httpsCallable } from "firebase/functions";
 import recordToDataCite from "./recordToDataCite";
-import firebase from "../firebase";
-import {getAuthHash} from "./firebaseEnableDoiCreation";
 
-async function performUpdateDraftDoi(record, region, language) {
-     const dataciteAuthHash = await getAuthHash(region);
+async function performUpdateDraftDoi(record, region, language, datacitePrefix, dataciteAuthHash) {
+  const functions = getFunctions();
+  const updateDraftDoi = httpsCallable(functions, "updateDraftDoi");
 
-      const mappedDataCiteObject = recordToDataCite(record, language, region);
-      delete mappedDataCiteObject.data.type;
-      delete mappedDataCiteObject.data.attributes.prefix;
+  const mappedDataCiteObject = recordToDataCite(record, language, region, datacitePrefix);
+  delete mappedDataCiteObject.data.type;
+  delete mappedDataCiteObject.data.attributes.prefix;
 
-      // Extract DOI from the full URL
-      const doi = record.datasetIdentifier.replace('https://doi.org/', '');
+  // Extract DOI from the full URL
+  const doi = record.datasetIdentifier.replace('https://doi.org/', '');
 
-      const dataObject = {
-        doi,
-        data: mappedDataCiteObject,
-        dataciteAuthHash,
-      }
+  const dataObject = {
+    doi,
+    data: mappedDataCiteObject,
+    dataciteAuthHash,
+  }
 
-      const response = await firebase.functions().httpsCallable("updateDraftDoi")(dataObject);
-      return response.data.status;
-    }
+  const response = await updateDraftDoi(dataObject);
+  return response.data.status;
+}
 
 export default performUpdateDraftDoi;