diff --git a/votai_general_theme/templates/disqus.html b/votai_general_theme/templates/disqus.html
new file mode 100644
index 00000000..9bec129d
--- /dev/null
+++ b/votai_general_theme/templates/disqus.html
@@ -0,0 +1,19 @@
+{% load votainteligente_extras %}
+{% if 'enabled'|disqus and 'shortname'|disqus %}
+<div class="disqus">
+    <div id="disqus_thread"></div>
+    <script type="text/javascript">
+        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+        var disqus_shortname = '{{ 'shortname'|disqus }}'; // required: replace example with your forum shortname
+        var disqus_developer = {{ 'dev_mode'|disqus }};
+        /* * * DON'T EDIT BELOW THIS LINE * * */
+        (function() {
+            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+    </script>
+    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+    <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+</div>
+{% endif %}
diff --git a/votai_general_theme/templates/elections/candidate_detail.html b/votai_general_theme/templates/elections/candidate_detail.html
index fec1a9cf..678abc41 100644
--- a/votai_general_theme/templates/elections/candidate_detail.html
+++ b/votai_general_theme/templates/elections/candidate_detail.html
@@ -145,25 +145,7 @@ <h3>{% trans "Cuestionario" %} {% if not candidate.has_answered %}{% no_ha_respo
 		{% endfor %}
 	</div>
 	{% endif %}
-
-	{% if 'enabled'|disqus and 'shortname'|disqus %}
-	<div class="disqus">
-		<div id="disqus_thread"></div>
-	    <script type="text/javascript">
-	        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-	        var disqus_shortname = '{{ 'shortname'|disqus }}'; // required: replace example with your forum shortname
-	        var disqus_developer = {{ 'dev_mode'|disqus }};
-	        /* * * DON'T EDIT BELOW THIS LINE * * */
-	        (function() {
-	            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-	            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-	            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-	        })();
-	    </script>
-	    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-	    <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-	</div>
-	{% endif %}
+    {% include 'disqus.html' %}
 	<script type="text/javascript">
 	var API_KEY = '{{ 'client_id'|website_imgur }}';
 	var candidate_name = '{{candidate.name}}';
@@ -182,4 +164,4 @@ <h3>{% trans "Cuestionario" %} {% if not candidate.has_answered %}{% no_ha_respo
 
 		$('.pop-fuente').popover();
 	});
-{% endblock extrajs %}
\ No newline at end of file
+{% endblock extrajs %}
diff --git a/votai_general_theme/templates/flatpages/default.html b/votai_general_theme/templates/flatpages/default.html
index 4bd4926c..98fa898b 100644
--- a/votai_general_theme/templates/flatpages/default.html
+++ b/votai_general_theme/templates/flatpages/default.html
@@ -8,5 +8,6 @@
 	<h2>{{ flatpage.title }}</h2>
 	{{ flatpage.content|markdown }}
   </div>
+    {% include 'disqus.html' %}
 </div>
 {% endblock content %}