diff --git a/node.tpl.php b/node.tpl.php
index 8954f7d..7dc26a6 100644
--- a/node.tpl.php
+++ b/node.tpl.php
@@ -101,7 +101,7 @@
 <?php print render($title_suffix); ?>
 
 
-  <?php if ($submitted && $page) { ?><div class="supermitted"><span class="submitted"><?php print $submitted; ?></span></div><?php }; ?>
+  <?php if ($display_submitted && $submitted && $page) { ?><div class="supermitted"><span class="submitted"><?php print $submitted; ?></span></div><?php }; ?>
 
 
     <div class="content"<?php print $content_attributes; ?>>
@@ -117,7 +117,7 @@
 
     <?php if (!empty($content['field_tags'])): ?><div class="taxonomy"><?php print render($content['field_tags']); ?></div><?php endif; ?>
     <?php if ($content['links']) { ?><div class="links-to-left"><div class="links"><?php print render($content['links']); ?></div></div><?php }; ?>
-    <?php if ($submitted && !$page) { ?><div class="submitted-to-right"><span class="submitted"><?php print $submitted?></span></div><?php }; ?>
+    <?php if ($display_submitted && $submitted && !$page) { ?><div class="submitted-to-right"><span class="submitted"><?php print $submitted?></span></div><?php }; ?>
     <?php print render($content['comments']); ?>
 
   </div>