diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.pl b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
index 67c2dafa6..ac8f1887a 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.pl
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
@@ -490,6 +490,7 @@ my $conf = Parse::PlainConfig->new('DELIM' => '=', 'FILE' => $pathToConfig);
 my $macros = $conf->get("macros");
 delete $macros->{"\\"};
 $macros->{"\\\\"} = "Backslash_pageUrl";
+$macros->{"Navigation"} = "Navigation";
 $conf->set("macros"=>$macros);
 my $wobjects = $conf->get("wobjects");
 my @newWobjects;
@@ -817,7 +818,7 @@ foreach $table (keys %dbFields){
 					   ! $identifier{cachedTemplate}{$replaceId."_".$repNav->{columns}->{seperator}}) {
   					   WebGUI::SQL->write("insert into template (templateId,namespace,name,template) values
 					  ($repNav->{columns}->{templateId}, ".quote('Navigation').", ".
-					  quote($identifier{$replaceId}).", ".quote($repNav->{template}).")");	
+					  quote("AutoGen ".$searchString).", ".quote($repNav->{template}).")");	
 					}
 					my $replacement = "^Navigation($identifier{cachedConfig}{$replaceId});";
 					 # print "\tReplacing macro $macro with $replacement ";