diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 737d3789..516fd3b5 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -14,12 +14,13 @@
       {% include 'article_infos.html' %}
       {{ article.content }}
     </div><!-- /.entry-content -->
-    {% if DISQUS_SITENAME %}
+    {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %}
     <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "{{ article.url }}";
+        var disqus_url = "{{ SITEURL }}/{{ article.url }}";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index be71022c..90586fe2 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -62,6 +62,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "a-markdown-powered-article.html";
+        var disqus_url = "./a-markdown-powered-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index 2616e332..ebad4b48 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -61,6 +61,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "article-1.html";
+        var disqus_url = "./article-1.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index 64cf12a8..81536509 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -61,6 +61,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "article-2.html";
+        var disqus_url = "./article-2.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 919e04e3..677c000e 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -61,6 +61,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "article-3.html";
+        var disqus_url = "./article-3.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index f763aa42..eb50cac5 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -57,18 +57,6 @@
 listed anywhere else.</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_identifier = "a-draft-article.html";
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-    </div>
     
   </article>
 </section>
diff --git a/tests/output/custom/filename_metadata-example.html b/tests/output/custom/filename_metadata-example.html
index af05059b..432a1cdf 100644
--- a/tests/output/custom/filename_metadata-example.html
+++ b/tests/output/custom/filename_metadata-example.html
@@ -61,6 +61,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "filename_metadata-example.html";
+        var disqus_url = "./filename_metadata-example.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index 07d4abec..10debbcd 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -63,6 +63,7 @@ Translations:
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "oh-yeah-fr.html";
+        var disqus_url = "./oh-yeah-fr.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index 899efc1d..bd51d7a5 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -68,6 +68,7 @@ YEAH !</p>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "oh-yeah.html";
+        var disqus_url = "./oh-yeah.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 8ebbb2b4..b3fbefb7 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -63,6 +63,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "second-article-fr.html";
+        var disqus_url = "./second-article-fr.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 7a543597..2bd3dea6 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -63,6 +63,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "second-article.html";
+        var disqus_url = "./second-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 3cbd9e5f..565d5aa3 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -72,6 +72,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "this-is-a-super-article.html";
+        var disqus_url = "./this-is-a-super-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 2ffc143d..be5c1f1a 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -63,6 +63,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "unbelievable.html";
+        var disqus_url = "./unbelievable.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';