diff --git a/main.js b/main.js
index be4a136..ae9c369 100644
--- a/main.js
+++ b/main.js
@@ -680,7 +680,7 @@
         localStorage.setItem(localStorageItems.LATTITUDE, lattitude)
         localStorage.setItem(localStorageItems.LONGITUDE, longitude)
         
-        document.querySelector("input[name=\"save_go\"]").click()
+        document.querySelector(`input[name="save_go"]`).click()
       })
     })
 
@@ -690,8 +690,8 @@
   function createSendButtons() {
     if (document.querySelector(".pseudo-save")) return
 
-    let saveAndStayButtons = document.querySelectorAll("input[name=\"save_go\"]")
-    let saveAndExitButtons = document.querySelectorAll("input[name=\"save_exit\"]")
+    let saveAndStayButtons = document.querySelectorAll(`input[name="save_go"]`)
+    let saveAndExitButtons = document.querySelectorAll(`input[name="save_exit"]`)
     let saveButtons = [...saveAndStayButtons, ...saveAndExitButtons]
 
     for (let saveButton of saveButtons) {
@@ -700,9 +700,15 @@
       pseudoSaveButton.textContent = saveButton.value
       pseudoSaveButton.classList.add("safe-action", "pseudo-save")
       pseudoSaveButton.addEventListener("click", async () => await sendForm(() => {
+        if (document.querySelector(`input[name="cp[id]"]`).value != '') {
+          saveButton.click()
+          return
+        }
+
         if (saveButton.name == "save_exit") {
           localStorage.setItem(localStorageItems.REDIRECT_EXIT, true)
         }
+        
         saveAndStayButtons[0].click()
       }))