Index: pageroute.page_edit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pageroute/pageroute.page_edit.inc,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 pageroute.page_edit.inc
--- pageroute.page_edit.inc	15 Sep 2009 10:07:55 -0000	1.1.2.11
+++ pageroute.page_edit.inc	28 Sep 2009 10:46:09 -0000
@@ -12,6 +12,7 @@
  * PageroutePageEdit displays a node editing form.
  */
 class PageroutePageEdit extends PageroutePage {
+  protected $unsetNode = TRUE;
 
   function getForm(&$form, &$form_state, &$args) {
 
@@ -30,7 +31,6 @@
    *   given the function will use $nid page argument
    */
   public static function setNodeEditForm(&$form, &$form_state, &$page, &$args, $node = NULL) {
-
     if (!$node) {
       if ($args && isset($args['nid'])) {
         $nid = $args['nid'];
@@ -55,7 +55,6 @@
     }
 
     if (node_access('update', $node)) {
-      unset($form_state['node']);
       $form += drupal_retrieve_form($type .'_node_form', $form_state, $node);
       drupal_prepare_form($type .'_node_form', $form, $form_state);
     }
@@ -105,6 +104,9 @@
         break;
       case t('Save'):
         $args['default_target'] = PAGEROUTE_CURRENT;
+      case t('Forward'):
+      case t('Back'):
+        unset($form_state['node']);
         break;
     }
 
Index: pageroute.page_add.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pageroute/pageroute.page_add.inc,v
retrieving revision 1.1.2.10
diff -u -r1.1.2.10 pageroute.page_add.inc
--- pageroute.page_add.inc	10 Sep 2009 10:09:47 -0000	1.1.2.10
+++ pageroute.page_add.inc	28 Sep 2009 10:46:09 -0000
@@ -71,6 +71,12 @@
 
   public function formSubmitted(&$form_state) {
     switch ($form_state['clicked_button']['#value']) {
+      case t('Save'):
+        $args['default_target'] = PAGEROUTE_CURRENT;
+      case t('Forward'):
+      case t('Back'):
+        unset($form_state['node']);
+        break;
       case t('Preview'):
         $form_state['storage']['args']['default_target'] = PAGEROUTE_CURRENT;
         break;