diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index ad715be..50f22bf 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -82,7 +82,8 @@
 						<div class="control-group">
 							<label class="control-label" for="grouptitle">[[user:grouptitle]]</label>
 							<div class="controls">
-								<select class="form-control" id="groupTitle" data-property="groupTitle">
+
+								<select class="form-control" id="groupTitle" data-property="groupTitle" <!-- IF allowMultipleBadges --> multiple<!-- ENDIF allowMutlipleBadges -->>
 									<option value="">[[user:no-group-title]]</option>
 									<!-- BEGIN groups -->
 									<!-- IF groups.userTitleEnabled -->
diff --git a/templates/partials/topic/badge.tpl b/templates/partials/topic/badge.tpl
index 92bd336..28590e0 100644
--- a/templates/partials/topic/badge.tpl
+++ b/templates/partials/topic/badge.tpl
@@ -1,3 +1,5 @@
-<!-- IF posts.user.selectedGroup.slug -->
-<a href="{config.relative_path}/groups/{posts.user.selectedGroup.slug}"><small class="label group-label inline-block" style="background-color: {posts.user.selectedGroup.labelColor};"><!-- IF posts.user.selectedGroup.icon --><i class="fa {posts.user.selectedGroup.icon}"></i> <!-- ENDIF posts.user.selectedGroup.icon -->{posts.user.selectedGroup.userTitle}</small></a>
-<!-- ENDIF posts.user.selectedGroup.slug -->
\ No newline at end of file
+<!-- BEGIN posts.user.selectedGroups -->
+<!-- IF posts.user.selectedGroups.slug -->
+<a href="{config.relative_path}/groups/{posts.user.selectedGroups.slug}"><small class="label group-label inline-block" style="background-color: {posts.user.selectedGroups.labelColor};"><!-- IF posts.user.selectedGroups.icon --><i class="fa {posts.user.selectedGroups.icon}"></i> <!-- ENDIF posts.user.selectedGroups.icon -->{posts.user.selectedGroups.userTitle}</small></a>
+<!-- ENDIF posts.user.selectedGroups.slug -->
+<!-- END posts.user.selectedGroups -->
\ No newline at end of file