diff --git a/jam-ui/src/components/page/JKEditProfile.js b/jam-ui/src/components/page/JKEditProfile.js
index 6d4cfdc1a..ca5cf20eb 100644
--- a/jam-ui/src/components/page/JKEditProfile.js
+++ b/jam-ui/src/components/page/JKEditProfile.js
@@ -5,7 +5,7 @@ import FalconCardHeader from '../common/FalconCardHeader';
 import { useTranslation } from 'react-i18next';
 import JKProfileAvatar from '../profile/JKProfileAvatar';
 import { useAuth } from '../../context/UserAuth';
-import { useForm, Controller, set } from 'react-hook-form';
+import { useForm, Controller } from 'react-hook-form';
 import {
   getPersonById,
   getInstruments,
@@ -45,7 +45,7 @@ function JKEditProfile() {
     { value: '3', label: t('profeciency.advanced') }
   ];
 
-  const { register, control, handleSubmit, setValue, getValues } = useForm({
+  const { register, control, handleSubmit, setValue, getValues, isDirty } = useForm({
     defaultValues: {
       firstName: '',
       lastName: '',
@@ -396,20 +396,16 @@ function JKEditProfile() {
   };
 
   useEffect(() => {
-    const handleBeforeUnload = event => {
-      // Perform actions before the component unloads
-      if (!updating) {
-        alert('Please let the page finish updating before leaving');
-        return;
-      }
-      event.preventDefault();
-      event.returnValue = '';
-    };
-    window.addEventListener('beforeunload', handleBeforeUnload);
+    function beforeUnload(e) {
+      if (updating) e.preventDefault();
+    }
+
+    window.addEventListener('beforeunload', beforeUnload);
+
     return () => {
-      window.removeEventListener('beforeunload', handleBeforeUnload);
+      window.removeEventListener('beforeunload', beforeUnload);
     };
-  }, []);
+  }, [updating]);
 
   const toggleAvatarUpload = () => {
     setShowAvatarUpload(!showAvatarUpload);
@@ -417,7 +413,7 @@ function JKEditProfile() {
 
   return (
     <>
-      <Prompt when={updating} message="The changes are been saved. Are you sure you want to leave?" />
+      <Prompt when={updating} message="The changes are being saved. Are you sure you want to leave?" />
       <Card>
         <FalconCardHeader title={t('page_title', { ns: 'profile' })} titleClass="font-weight-bold">
           {updating && (