diff --git a/isso/views/comments.py b/isso/views/comments.py
index c7954a8fe..2e11277df 100644
--- a/isso/views/comments.py
+++ b/isso/views/comments.py
@@ -3,7 +3,6 @@
 from __future__ import unicode_literals
 
 import re
-import cgi
 import time
 import functools
 import json  # json.dumps to put URL in <script>
@@ -29,6 +28,10 @@
 from isso.utils.hash import sha1
 from isso.utils.hash import md5
 
+try:
+    from cgi import escape
+except ImportError:
+    from html import escape
 try:
     from urlparse import urlparse
 except ImportError:
@@ -263,7 +266,7 @@ def new(self, environ, request, uri):
 
         for field in ("author", "email", "website"):
             if data.get(field) is not None:
-                data[field] = cgi.escape(data[field])
+                data[field] = escape(data[field], quote=False)
 
         if data.get("website"):
             data["website"] = normalize(data["website"])