diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index d33e5f1372..e861a9513c 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -329,6 +329,10 @@ define(['taskbar'], function(taskbar) {
 						composer.activateReposition(composer.active);
 					}
 				});
+
+				$(window).trigger('action:composer.loaded', {
+					post_uuid: post_uuid
+				});
 			});
 		});
 	}
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index c68438c48b..8bca98cdd0 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -55,7 +55,7 @@
 							<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}">
 								<i class="fa fa-circle status offline"></i>
 								<span class="visible-xs-inline visible-md-inline"><img class="" src="{posts.picture}" width=18 height=18 />&nbsp;</span>
-								<span class="username-field" href="{relative_path}/user/{posts.userslug}" itemprop="author">{posts.username}&nbsp;</span>
+								<span class="username-field" href="{relative_path}/user/{posts.userslug}" itemprop="author" data-username="{posts.username}">{posts.username}&nbsp;</span>
 								<span class="caret"></span>
 							</button>