diff --git a/autosave.js b/autosave.js
index 15d7217..6929f16 100644
--- a/autosave.js
+++ b/autosave.js
@@ -101,7 +101,7 @@ Drupal.saveForm = function() {
   }
   
   var serialized = $('#node-form').formHash();
-  serialized['q'] =  Drupal.settings.autosave.q;
+  serialized['autosave_path'] =  Drupal.settings.autosave.autosave_path;
   $.ajax({
     url: Drupal.settings.autosave.url,
     type: "POST",
diff --git a/autosave.module b/autosave.module
index 5419eb3..7654ccd 100644
--- a/autosave.module
+++ b/autosave.module
@@ -58,7 +58,7 @@ function autosave_menu() {
  *   True if this user should have access to save this form, false otherwise.
 */
 function autosave_save_access() {
-  $path = trim($_POST['q'], '/');
+  $path = trim($_POST['autosave_path'], '/');
   $menu_item = menu_get_item($path);
 
   $token = isset($_POST['form_token'], $_POST['form_id']) && drupal_valid_token($_POST['form_token'], $_POST['form_id']);
@@ -66,7 +66,6 @@ function autosave_save_access() {
   return $token && $menu;
 }
 
-
 /**
  * Menu callback; return the autosave module settings form.
  */
@@ -130,7 +129,7 @@ function autosave_form_alter(&$form, &$form_state, $form_id) {
       
       $settings['autosave']['url'] = url('autosave/handler/' . $token);
       $settings['autosave']['period'] = variable_get('autosave_period', 10);
-      $settings['autosave']['q'] = $path;
+      $settings['autosave']['autosave_path'] = $path;
       $settings['autosave']['hidden'] = variable_get('autosave_hidden', 0);
       
       // If an autosaved version of the form exists, make it available via javascript.
@@ -146,19 +145,17 @@ function autosave_form_alter(&$form, &$form_state, $form_id) {
   }
 }
 
-
 /**
  * Menu callback; autosaves the node.
  */
 function autosave_save() {
   global $user;
-  
-  $path = $_POST['q'];
+  $path = $_POST['autosave_path'];
   $form_id = $_POST['form_id'];
 
   // Not all variables need to be serialized.
   //    - for Drupal 6 version need to remove op and form_build_id
-  unset($_POST['q'], $_POST['op'], $_POST['form_build_id']);
+  unset($_POST['autosave_path'], $_POST['op'], $_POST['form_build_id']);
   $serialized = serialize($_POST);
 
   // check if node has just been saved - if it has then it's because AS ajax fired off as user was submitting
@@ -166,12 +163,12 @@ function autosave_save() {
   //    - easy to figure out if we are submitting an edit to existing node
   //    - little harder if we have just added a node
   $path_args = explode("/", $path);
-  
+
   // update case
   if (is_numeric($path_args[1])) {
     $submitted = node_load($path_args[1]);
-  }        
-  
+  }
+
   // add case
   else {
     $submitted->changed = db_result(db_query("SELECT created FROM {node} WHERE uid = %d and type = '%s' ORDER BY created DESC LIMIT 1", $user->uid, str_replace("-", "_", $path_args[2])));