diff --git a/wasa2il/templates/election/election_view.html b/wasa2il/templates/election/election_view.html
index 99441756..8259aafa 100644
--- a/wasa2il/templates/election/election_view.html
+++ b/wasa2il/templates/election/election_view.html
@@ -195,7 +195,7 @@
{% trans "Election:" %} {{ election.name }}
{% if not voting_interface_enabled or election.election_state != 'voting' or started_voting or step == "vote" %}
{% trans "About This Election" %}
-
{{ election.instructions|safe|linebreaks }}
+
{{ election.instructions|markdown|urlize }}
{% endif %}
{% endif %}
@@ -282,7 +282,7 @@ {% trans "Votes" %} {% trans "your favorites first!" %}
{% else %}
{% if election.instructions %}
{% trans "About This Election" %}
- {{ election.instructions|safe|linebreaks }}
+ {{ election.instructions|markdown|urlize }}
{% endif %}
{% trans "How To Vote" %}
diff --git a/wasa2il/templates/issue/document_detail.html b/wasa2il/templates/issue/document_detail.html
index 89831364..0340f102 100644
--- a/wasa2il/templates/issue/document_detail.html
+++ b/wasa2il/templates/issue/document_detail.html
@@ -262,7 +262,7 @@ {% trans "Versions" %}
{{ content.get_status_display }} |
{% endif %}
{{ content.user.get_full_name|default:content.user.username }} |
- {{ content.comments|linebreaks }} |
+ {{ content.comments|markdown|urlize }} |
{% endfor %}
{% if action == 'new' %}
diff --git a/wasa2il/templates/issue/issue_detail.html b/wasa2il/templates/issue/issue_detail.html
index fab97b3e..b3b45dfd 100644
--- a/wasa2il/templates/issue/issue_detail.html
+++ b/wasa2il/templates/issue/issue_detail.html
@@ -47,7 +47,7 @@ {{ issue.name }}
{% endif %}
- {{ issue.description|linebreaks }}
+ {{ issue.description|markdown|urlize }}
diff --git a/wasa2il/templates/issue/stub/document_view.html b/wasa2il/templates/issue/stub/document_view.html
index 5c9f00f6..37ab53de 100644
--- a/wasa2il/templates/issue/stub/document_view.html
+++ b/wasa2il/templates/issue/stub/document_view.html
@@ -101,6 +101,6 @@
{% endif %}
- {{ documentcontent.text|markdown }}
+ {{ documentcontent.text|markdown|urlize }}
diff --git a/wasa2il/templates/profile/profile.html b/wasa2il/templates/profile/profile.html
index a8efd92d..1274bd17 100644
--- a/wasa2il/templates/profile/profile.html
+++ b/wasa2il/templates/profile/profile.html
@@ -31,7 +31,7 @@ {% trans "Biography" %}
{% if profile.bio %}
- {{profile.bio|markdown}}
+ {{ profile.bio|markdown|urlize }}
{% else %}
{% trans "This user hasn't provided a biography." %}
{% endif %}
diff --git a/wasa2il/templates/termsandconditions/tc_view_terms.html b/wasa2il/templates/termsandconditions/tc_view_terms.html
index 79b21bf3..b61a86ac 100644
--- a/wasa2il/templates/termsandconditions/tc_view_terms.html
+++ b/wasa2il/templates/termsandconditions/tc_view_terms.html
@@ -25,12 +25,12 @@
{% if terms.info %}
{% trans 'Information' %}:
-
{{ terms.info|markdown }}
+
{{ terms.info|markdown|urlize }}
{% endif %}
- {{ terms.text|safe|markdown }}
+ {{ terms.text|markdown|urlize }}
{% endfor %}