diff --git a/_sakura/templates/yuuno/main/news.tpl b/_sakura/templates/yuuno/main/news.tpl
index 2c39aa1..be165c7 100644
--- a/_sakura/templates/yuuno/main/news.tpl
+++ b/_sakura/templates/yuuno/main/news.tpl
@@ -19,16 +19,16 @@
         </div>
     {% if newsPosts|length > 1 %}
         <script type="text/javascript">
-            /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-            var disqus_shortname = 'flashii';
 
-            /* * * DO NOT EDIT BELOW THIS LINE * * */
+            var disqus_shortname = '{{ sakura.disqus_shortname }}';
+
             (function () {
                 var s = document.createElement('script'); s.async = true;
                 s.type = 'text/javascript';
                 s.src = '//' + disqus_shortname + '.disqus.com/count.js';
                 (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
             }());
+
         </script>
     {% elseif newsPosts|length == 1 %}
         <div id="disqus_thread">
diff --git a/main/news.php b/main/news.php
index 65cb0c1..7085a24 100644
--- a/main/news.php
+++ b/main/news.php
@@ -28,7 +28,7 @@ $disqus_data = [
 $renderData['newsPosts'] = Main::getNewsPosts((isset($_GET['id']) && !isset($_GET['xml']) && is_numeric($_GET['id'])) ? $_GET['id'] : null, (isset($_GET['id']) && !isset($_GET['xml']) && is_numeric($_GET['id'])));
 $renderData['page'] = [
     'title'         => (isset($_GET['id']) ? (count($renderData['newsPosts']) ? $renderData['newsPosts'][0]['title'] : 'Post does not exist!') : 'Flashii News'),
-    'disqus_sso'    => ($disqus_user['password_algo'] == 'nologin' ? '{}' : (($disqus_message = base64_encode(json_encode($disqus_data))) .' '. Main::dsqHmacSha1($disqus_message .' '. time(), Configuration::getConfig('disqus_api_secret')) .' '. time()))
+    'disqus_sso'    => (($disqus_message = base64_encode(json_encode($disqus_data))) .' '. Main::dsqHmacSha1($disqus_message .' '. time(), Configuration::getConfig('disqus_api_secret')) .' '. time())
 ];
 
 // News XML feed