diff --git a/bl-themes/blogme/php/home.php b/bl-themes/blogme/php/home.php
index 0bed7bb2..12cbcd2d 100644
--- a/bl-themes/blogme/php/home.php
+++ b/bl-themes/blogme/php/home.php
@@ -9,7 +9,7 @@
 	<header>
 		<div class="title">
 			<h1><a href="<?php echo $Post->permalink() ?>"><?php echo $Post->title() ?></a></h1>
-			<div class="info"><span><i class="fa fa-clock-o"></i> <?php echo $Post->date() ?></span><span><i class="fa fa-user"></i> <?php echo Text::isNotEmpty($Post->user('firstName'))?$Post->user('username'):$Post->user('firstName') ?></span></div>
+			<div class="info"><span><i class="fa fa-clock-o"></i> <?php echo $Post->date() ?></span><span><i class="fa fa-user"></i> <?php echo Text::isNotEmpty($Post->user('firstName'))?$Post->user('firstName'):$Post->user('username') ?></span></div>
 		</div>
 	</header>
 
diff --git a/bl-themes/blogme/php/post.php b/bl-themes/blogme/php/post.php
index fd2ab921..e0726665 100644
--- a/bl-themes/blogme/php/post.php
+++ b/bl-themes/blogme/php/post.php
@@ -9,7 +9,7 @@
 	<header>
 		<div class="title">
 			<h1><a href="<?php echo $Post->permalink() ?>"><?php echo $Post->title() ?></a></h1>
-			<div class="info"><span><i class="fa fa-clock-o"></i> <?php echo $Post->date() ?></span><span><i class="fa fa-user"></i> <?php echo Text::isNotEmpty($Post->user('firstName'))?$Post->user('username'):$Post->user('firstName') ?></span></div>
+			<div class="info"><span><i class="fa fa-clock-o"></i> <?php echo $Post->date() ?></span><span><i class="fa fa-user"></i> <?php echo Text::isNotEmpty($Post->user('firstName'))?$Post->user('firstName'):$Post->user('username') ?></span></div>
 		</div>
 	</header>