diff --git a/branches/DNN_5/Forum_PostReport.ascx b/branches/DNN_5/Forum_PostReport.ascx
index 20821d3..9efdef7 100644
--- a/branches/DNN_5/Forum_PostReport.ascx
+++ b/branches/DNN_5/Forum_PostReport.ascx
@@ -24,7 +24,7 @@
 		</div>
 		<ul class="dnnActions dnnClear">
 			<li><asp:linkbutton cssclass="dnnPrimaryAction" id="cmdReport" runat="server" resourcekey="cmdReport" /></li>
-			<li><asp:HyperLink cssclass="dnnSecondaryAction" id="cmdCancel" runat="server" resourcekey="cmdCancel" /></li>
+			<li><asp:linkbutton cssclass="dnnSecondaryAction" id="cmdCancel" runat="server" resourcekey="cmdCancel" /></li>
 		</ul>
 	</fieldset>
 </div>
\ No newline at end of file
diff --git a/branches/DNN_5/Forum_PostReport.ascx.designer.vb b/branches/DNN_5/Forum_PostReport.ascx.designer.vb
index b91d36c..9769895 100644
--- a/branches/DNN_5/Forum_PostReport.ascx.designer.vb
+++ b/branches/DNN_5/Forum_PostReport.ascx.designer.vb
@@ -129,6 +129,6 @@ Namespace DotNetNuke.Modules.Forum
         '''Auto-generated field.
         '''To modify move field declaration from designer file to code-behind file.
         '''</remarks>
-        Protected WithEvents cmdCancel As Global.System.Web.UI.WebControls.HyperLink
+        Protected WithEvents cmdCancel As Global.System.Web.UI.WebControls.LinkButton
     End Class
 End Namespace
diff --git a/branches/DNN_5/Forum_PostReport.ascx.vb b/branches/DNN_5/Forum_PostReport.ascx.vb
index 98338cf..17397f0 100644
--- a/branches/DNN_5/Forum_PostReport.ascx.vb
+++ b/branches/DNN_5/Forum_PostReport.ascx.vb
@@ -118,12 +118,6 @@ Namespace DotNetNuke.Modules.Forum
                 ForumUtils.LoadCssFile(DefaultPage, objConfig)
 
                 If Page.IsPostBack = False Then
-                    If Not Request.UrlReferrer Is Nothing Then
-                        cmdCancel.NavigateUrl = Request.UrlReferrer.ToString()
-                    Else
-                        cmdCancel.NavigateUrl = NavigateURL()
-                    End If
-
                     PopulatePost(_PostInfo)
                     PopulateTemplateDDL()
 
@@ -139,6 +133,14 @@ Namespace DotNetNuke.Modules.Forum
             End Try
         End Sub
 
+        Protected Sub cmdCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cmdCancel.Click
+            If Not ViewState("UrlReferrer") Is Nothing Then
+                Response.Redirect(CType(ViewState("UrlReferrer"), String), False)
+            Else
+                Response.Redirect(NavigateURL())
+            End If
+        End Sub
+
         ''' <summary>
         ''' Reports a post as abusive
         ''' </summary>