diff --git a/less/topic.less b/less/topic.less
index 5c8e02e..5623569 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -34,6 +34,11 @@
 				border-radius: 50%;
 			}
 		}
+
+		.group-label {
+			border-radius: 0;
+			vertical-align: 18%;
+		}
 	}
 
 	.stats {
diff --git a/templates/partials/topic/badge.tpl b/templates/partials/topic/badge.tpl
new file mode 100644
index 0000000..3802f5c
--- /dev/null
+++ b/templates/partials/topic/badge.tpl
@@ -0,0 +1,9 @@
+<!-- IF posts.user.groups.length -->
+<!-- BEGIN groups -->
+<!-- IF groups.selected -->
+<!-- IF groups.userTitleEnabled -->
+<a href="{relative_path}/groups/{posts.user.groups.slug}"><small class="label group-label inline-block" style="background-color: {posts.user.groups.labelColor};"><!-- IF posts.user.groups.icon --><i class="fa {posts.user.groups.icon}"></i> <!-- ENDIF posts.user.groups.icon -->{posts.user.groups.userTitle}</small></a>
+<!-- ENDIF groups.userTitleEnabled -->
+<!-- ENDIF groups.selected -->
+<!-- END groups -->
+<!-- ENDIF posts.user.groups.length -->
\ No newline at end of file
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 9cdbf66..215fafe 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -14,6 +14,8 @@
 			<a class="username-field" href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" itemprop="author" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.username}</a>
 		</strong>
 
+		<!-- IMPORT partials/topic/badge.tpl -->
+
 		[[global:posted_ago, <span class="timeago" title="{posts.relativeTime}"></span>]]
 
 		<!-- IF posts.editor.username -->