diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index eef538f4bd..1526809f45 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -37,6 +37,7 @@
 
 	"has_no_follower": "This user doesn't have any followers :(",
 	"follows_no_one": "This user isn't following anyone :(",
+	"has_no_posts": "This user didn't post anything yet.",
 
 	"email_hidden": "Email Hidden",
 	"hidden": "hidden"
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index efdc406c7c..1730b4bc99 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -3,36 +3,37 @@
 
 </div>
 
-<div class="well account">
+<div class="account">
 
 	<div class="row">
 		<div class="col-md-5 account-block">
 
-			<div class="text-center account-picture-block">
-				<div>
-					<a href="{relative_path}/user/{userslug}"><img src="{picture}" class="user-profile-picture img-thumbnail"/></a>
-				</div>
-
-				<div>
+			<div class="text-center account-picture-block panel panel-default">
+				<div class="panel-body">
 					<div>
-						<span>
-							<i class="account-online-status fa fa-circle status offline"></i>
-							<span class="account-username"> {username}</span>
-						</span>
+						<a href="{relative_path}/user/{userslug}"><img src="{picture}" class="user-profile-picture img-thumbnail"/></a>
 					</div>
 
-					<!-- IF banned -->
 					<div>
-						<span class="label label-danger">[[user:banned]]</span>
-					</div>
-					<!-- ENDIF banned -->
-					<div>
-						<a id="chat-btn" href="#" class="btn btn-primary hide">Chat</a>
-						<a id="follow-btn" href="#" class="btn btn-success hide">Follow</a>
-						<a id="unfollow-btn" href="#" class="btn btn-warning hide">Unfollow</a>
+						<div>
+							<span>
+								<i class="account-online-status fa fa-circle status offline"></i>
+								<span class="account-username"> {username}</span>
+							</span>
+						</div>
+
+						<!-- IF banned -->
+						<div>
+							<span class="label label-danger">[[user:banned]]</span>
+						</div>
+						<!-- ENDIF banned -->
+						<div>
+							<a id="chat-btn" href="#" class="btn btn-primary hide">Chat</a>
+							<a id="follow-btn" href="#" class="btn btn-success hide">Follow</a>
+							<a id="unfollow-btn" href="#" class="btn btn-warning hide">Unfollow</a>
+						</div>
 					</div>
 				</div>
-
 			</div>
 
 			<div class="text-center account-stats panel panel-default">
@@ -117,6 +118,9 @@
 					<h3 class="panel-title">[[global:recentposts]]</h3>
 				</div>
 				<div class="panel-body">
+					<!-- IF !posts.length -->
+					<span>[[user:has_no_posts]]</span>
+					<!-- ENDIF !posts.length -->
 					<!-- BEGIN posts -->
 					<div class="clearfix">
 						<p>{posts.content}</p>