diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js
index d70fcab..12222d6 100644
--- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js
+++ b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js
@@ -280,9 +280,10 @@ async function fetchUUIDCheck(givenUUID , strategy){
 }
 
 function checkUUIDChars(uuid) {
+    uuid.replace(/ /g,'')
     console.log("UUID in check: " + uuid);
     const regex = new RegExp("^[A-z0-9-]+$");
-    if(regex.test(uuid)){
+    if(regex.test(uuid) || uuid == ""){
         return uuid ;
     } 
     return "invalid";
@@ -309,7 +310,6 @@ function changeUUID(element){
             changeMessage = "success";
         }
         clientUUID = data;
-        $("#uuid-input").attr("disabled", true);
         $("#editable").attr("checked", false);
         
         uuidChangeModalDisplay(changeMessage);
diff --git a/Backend/mocked-services/src/main/resources/static/js/modal.js b/Backend/mocked-services/src/main/resources/static/js/modal.js
index f743055..84c4278 100644
--- a/Backend/mocked-services/src/main/resources/static/js/modal.js
+++ b/Backend/mocked-services/src/main/resources/static/js/modal.js
@@ -74,13 +74,16 @@ function showModal(jmodal){
 
 function hideModal(jmodal){
     if(!modalDisplayed) return;
+    if ($(uuidChangeModal).hasClass('active')) window.location.reload();
     overlay.removeClass('active');
     jmodal.removeClass('active');
     modalDisplayed = false;
 }
 
 btnModalClose.click(closeModals);
+
 overlay.click(closeModals);
+
 dataLossModalNo.click(closeModals);
 dataLossModalYes.click(dropChangesAndClose);