diff --git a/pgweb/docs/views.py b/pgweb/docs/views.py
index 6aba57ca..e9fc639a 100644
--- a/pgweb/docs/views.py
+++ b/pgweb/docs/views.py
@@ -132,6 +132,9 @@ def commentform(request, itemid, version, filename):
 	if request.method == 'POST':
 		form = DocCommentForm(request.POST)
 		if form.is_valid():
+			if version == '0.0':
+				version = 'devel'
+
 			send_template_mail(
 				settings.DOCSREPORT_NOREPLY_EMAIL,
 				settings.DOCSREPORT_EMAIL,
diff --git a/templates/docs/docspage.html b/templates/docs/docspage.html
index 32effd2b..ca2bd174 100644
--- a/templates/docs/docspage.html
+++ b/templates/docs/docspage.html
@@ -95,7 +95,7 @@ This page in other versions:
 If you see anything in the documentation that is not correct, does not match
 your experience with the particular feature or requires further clarification,
 please use
-<a href="/account/comments/new/{{page.version.numtree}}/{{page.file}}/" rel="nofollow">this form</a>
+<a href="/account/comments/new/{{page.version.numtree|default:"devel"}}/{{page.file}}/" rel="nofollow">this form</a>
 to report a documentation issue.
 </p>
 </div>