diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl
index bffbc46..2a47132 100644
--- a/templates/flags/detail.tpl
+++ b/templates/flags/detail.tpl
@@ -13,6 +13,7 @@
 
 		<hr />
 
+		<!-- IF type_bool.post -->
 		<div class="media">
 			<div class="media-left">
 				<a href="{config.relative_path}/user/{target.user.userslug}">
@@ -28,6 +29,28 @@
 				{target.content}
 			</div>
 		</div>
+		<!-- ENDIF type_bool.post -->
+
+		<!-- IF type_bool.user -->
+		<div class="media">
+			<div class="media-left">
+				<a href="{config.relative_path}/user/{target.userslug}">
+					<!-- IF target.picture -->
+					<img class="media-object avatar avatar-lg" src="{target.picture}" alt="{target.username}" />
+					<!-- ELSE -->
+					<div class="media-object avatar avatar-lg" style="background-color: {target.icon:bgColor}">{target.icon:text}</div>
+					<!-- ENDIF target.picture -->
+				</a>
+			</div>
+			<div class="media-body">
+				<h4 class="media-heading"><a href="{config.relative_path}/user/{target.userslug}">{target.username}</a></h4>
+				<p class="lead">
+					<a href="{config.relative_path}/uid/{target.uid}">[[flags:user-view]]</a> |
+					<a href="{config.relative_path}/uid/{target.uid}/edit">[[flags:user-edit]]</a>
+				</p>
+			</div>
+		</div>
+		<!-- ENDIF type_bool.user -->
 
 		<hr />
 
diff --git a/templates/partials/account/menu.tpl b/templates/partials/account/menu.tpl
index e879fca..96cec02 100644
--- a/templates/partials/account/menu.tpl
+++ b/templates/partials/account/menu.tpl
@@ -14,6 +14,9 @@
 		<li>
 			<a component="account/new-chat" href="#">[[user:new_chat_with, {username}]]</a>
 		</li>
+		<li>
+			<a component="account/flag" href="#">[[user:flag-profile]]</a>
+		</li>
 		<li class="divider"></li>
 		<!-- ENDIF !banned -->
 		<!-- ENDIF !config.disableChat -->
diff --git a/templates/partials/modals/flag_post_modal.tpl b/templates/partials/modals/flag_modal.tpl
similarity index 54%
rename from templates/partials/modals/flag_post_modal.tpl
rename to templates/partials/modals/flag_modal.tpl
index 1a0aeb7..66638da 100644
--- a/templates/partials/modals/flag_post_modal.tpl
+++ b/templates/partials/modals/flag_modal.tpl
@@ -4,25 +4,28 @@
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 				<h4 class="modal-title">
-					[[topic:flag]]
-					<a href="{config.relative_path}/post/{pid}">Post #{pid}</a> by
-					<a href="{config.relative_path}/user/{userslug}">{username}</a>
+					[[flags:modal-title]]
 				</h4>
 			</div>
 			<div class="modal-body">
+				<p class="lead">
+					[[flags:modal-body, {type}, {id}]]
+				</p>
 				<div class="form-group">
-					<button class="btn btn-default form-control flag-reason">[[topic:spam]]</button>
+					<textarea class="form-control" id="flag-reason-custom" placeholder="[[flags:modal-reason-custom]]"></textarea>
 				</div>
-				<div class="form-group">
-					<button class="btn btn-default form-control flag-reason">[[topic:offensive]]</button>
-				</div>
-				<div class="form-group">
-					<textarea class="form-control" id="flag-reason-custom" placeholder="[[topic:custom-flag-reason]]"></textarea>
+				<div class="btn-group btn-group-justified">
+					<div class="btn-group">
+						<button class="btn btn-default flag-reason">[[flags:modal-reason-spam]]</button>
+					</div>
+					<div class="btn-group">
+						<button class="btn btn-default flag-reason">[[flags:modal-reason-offensive]]</button>
+					</div>
 				</div>
 			</div>
 
 			<div class="modal-footer">
-				<button type="button" class="btn btn-primary" id="flag-post-commit" disabled>[[topic:flag]]</button>
+				<button type="button" class="btn btn-primary" id="flag-post-commit" disabled>[[flags:modal-submit]]</button>
 			</div>
 		</div>
 	</div>