--- override_node_options.module	2009-04-11 13:57:08.000000000 +0200
+++ ../../override_node_options.module	2009-07-19 20:32:53.000000000 +0200
@@ -254,21 +254,22 @@
               }
 
         // Node creation date override
-        if ($node->date !== $node->override_authored_on || !empty($node->override_authored_on)) {
+        if (isset($node->override_authored_on) && user_access('override ' . $node->type . ' authored on option') && ($node->date != $node->override_authored_on)) { 
          $node->date = $node->override_authored_on;
          $node->created = !empty($node->override_authored_on) ? strtotime($node->override_authored_on) : time();
         }
         
-        
+        if (isset($node->override_authored_by) && user_access('override ' . $node->type . ' authored by option') && ($node->name != $node->override_authored_by)) { 
           if (!empty($node->override_authored_by)) {
             $account = user_load(array('name' => $node->override_authored_by));
             $node->name = $account->name;
             $node->uid = $account->uid;
           }
-          elseif ($node->override_authored_by == "" && user_access('override ' . $node->type . ' authored by option'))  {
+          else {
             $node->name = "";
             $node->uid = 0;
           }
+        }
 
 }