diff --git a/omega/template.php b/omega/template.php
index a94c605..bb3f621 100644
--- a/omega/template.php
+++ b/omega/template.php
@@ -145,6 +145,11 @@ function omega_alpha_preprocess_node(&$vars) {
 
   // Adding a class to the title attributes
   $vars['title_attributes_array']['class'][] = 'node-title';
+
+  // Format the author name and post date for nodes.
+  if ($vars['name'] && $vars['date']) {
+    $vars['submitted'] = $vars['date'] . ' -- ' . $vars['name'];
+  }
 }
 
 /**
diff --git a/omega/templates/node.tpl.php b/omega/templates/node.tpl.php
index fae8079..a0fd7f1 100644
--- a/omega/templates/node.tpl.php
+++ b/omega/templates/node.tpl.php
@@ -7,8 +7,8 @@
   </header>
   <?php endif; ?>
   <?php print render($title_suffix); ?>
-  <?php if ($display_submitted): ?>
-  <footer class="submitted"><?php print $date; ?> -- <?php print $name; ?></footer>
+  <?php if ($display_submitted && $submitted): ?>
+  <footer class="submitted"><?php print $submitted; ?></footer>
   <?php endif; ?>
 
   <div<?php print $content_attributes; ?>>