diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 2d51aba..02c9997 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.1.466")]
-[assembly: AssemblyFileVersion("3.0.1.466")]
+[assembly: AssemblyVersion("3.0.1.467")]
+[assembly: AssemblyFileVersion("3.0.1.467")]
diff --git a/WebApplication/Default.aspx.cs b/WebApplication/Default.aspx.cs
index ee39f1e..22fb0a9 100644
--- a/WebApplication/Default.aspx.cs
+++ b/WebApplication/Default.aspx.cs
@@ -122,8 +122,9 @@ namespace ScrewTurn.Wiki {
 			
 			lblDiscussLink.Visible = !discussMode && !viewCodeMode && canViewDiscussion;
 			if(lblDiscussLink.Visible) {
-				lblDiscussLink.Text = string.Format(@"<a id=""DiscussLink"" title=""{0}"" href=""?Discuss=1"">{1} ({2})</a>",
-					Properties.Messages.Discuss, Properties.Messages.Discuss, Pages.GetMessageCount(currentPage));
+				lblDiscussLink.Text = string.Format(@"<a id=""DiscussLink"" title=""{0}"" href=""{3}?Discuss=1"">{1} ({2})</a>",
+					Properties.Messages.Discuss, Properties.Messages.Discuss, Pages.GetMessageCount(currentPage),
+					UrlTools.BuildUrl(NameTools.GetLocalName(currentPage.FullName), Settings.PageExtension));
 			}
 
 			lblEditLink.Visible = Settings.EnablePageToolbar && !discussMode && !viewCodeMode && canEdit;
@@ -137,8 +138,9 @@ namespace ScrewTurn.Wiki {
 			if(Settings.EnablePageToolbar && Settings.EnableViewPageCodeFeature) {
 				lblViewCodeLink.Visible = !discussMode && !viewCodeMode && !canEdit;
 				if(lblViewCodeLink.Visible) {
-					lblViewCodeLink.Text = string.Format(@"<a id=""ViewCodeLink"" title=""{0}"" href=""?Code=1"">{1}</a>",
-						Properties.Messages.ViewPageCode, Properties.Messages.ViewPageCode);
+					lblViewCodeLink.Text = string.Format(@"<a id=""ViewCodeLink"" title=""{0}"" href=""{2}?Code=1"">{1}</a>",
+						Properties.Messages.ViewPageCode, Properties.Messages.ViewPageCode,
+						UrlTools.BuildUrl(NameTools.GetLocalName(currentPage.FullName), Settings.PageExtension));
 				}
 			}
 			else lblViewCodeLink.Visible = false;