diff --git a/apps/ssb.json b/apps/ssb.json
index 71608ef3..272212ad 100644
--- a/apps/ssb.json
+++ b/apps/ssb.json
@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&0WzpczDOhxawXBY8fAPMQWwOuF8bVRO+cMJJTxBpYOQ=.sha256"
+	"previous": "&uSuRSjzMShdQllrt3gVYhWlixI6o6n0c1c/+pEhJCCI=.sha256"
 }
diff --git a/apps/ssb/tf-compose.js b/apps/ssb/tf-compose.js
index 7ecf0155..039665fc 100644
--- a/apps/ssb/tf-compose.js
+++ b/apps/ssb/tf-compose.js
@@ -13,6 +13,7 @@ class TfComposeElement extends LitElement {
 			branch: {type: String},
 			apps: {type: Object},
 			drafts: {type: Object},
+			author: {type: String},
 		};
 	}
 
@@ -25,6 +26,7 @@ class TfComposeElement extends LitElement {
 		this.branch = undefined;
 		this.apps = undefined;
 		this.drafts = {};
+		this.author = undefined;
 	}
 
 	process_text(text) {
@@ -284,13 +286,25 @@ class TfComposeElement extends LitElement {
 	}
 
 	firstUpdated() {
+		let values = Object.entries(this.users).map((x) => ({
+			key: x[1].name ?? x[0],
+			value: x[0],
+		}));
+		if (this.author) {
+			values = [].concat(
+				[
+					{
+						key: this.users[this.author]?.name,
+						value: this.author,
+					},
+				],
+				values
+			);
+		}
 		let tribute = new Tribute({
 			collection: [
 				{
-					values: Object.entries(this.users).map((x) => ({
-						key: x[1].name,
-						value: x[0],
-					})),
+					values: values,
 					selectTemplate: function (item) {
 						return `[@${item.original.key}](${item.original.value})`;
 					},
@@ -542,8 +556,7 @@ class TfComposeElement extends LitElement {
 								@input=${this.input}
 								@change=${this.change}
 								@paste=${this.paste}
-							>
-${draft.text}</textarea
+							>${draft.text}</textarea
 							>
 						</p>
 					</div>
@@ -552,9 +565,7 @@ ${draft.text}</textarea
 						<div id="preview"></div>
 					</div>
 				</div>
-				${Object.values(draft.mentions || {}).map((x) =>
-					self.render_mention(x)
-				)}
+				${Object.values(draft.mentions || {}).map((x) => self.render_mention(x))}
 				${this.render_attach_app()} ${this.render_content_warning()}
 				<button
 					class="w3-button w3-dark-grey"
diff --git a/apps/ssb/tf-message.js b/apps/ssb/tf-message.js
index ec94978d..84ff3c07 100644
--- a/apps/ssb/tf-message.js
+++ b/apps/ssb/tf-message.js
@@ -498,6 +498,7 @@ ${JSON.stringify(mention, null, 2)}</pre
 									branch=${this.message.id}
 									.drafts=${this.drafts}
 									@tf-discard=${this.discard_reply}
+									author=${this.message.author}
 								></tf-compose>
 							`
 						: html`
@@ -685,6 +686,7 @@ ${JSON.stringify(content, null, 2)}</pre
 									branch=${this.message.id}
 									.drafts=${this.drafts}
 									@tf-discard=${this.discard_reply}
+									author=${this.message.author}
 								></tf-compose>
 							`
 						: html`