diff --git a/components/chatmessage.cpp b/components/chatmessage.cpp
index b527ce4..dd469ab 100644
--- a/components/chatmessage.cpp
+++ b/components/chatmessage.cpp
@@ -593,11 +593,15 @@ Gtk::Widget *ChatMessageItemContainer::CreateReplyComponent(const Message &data)
 
     if (data.Interaction.has_value()) {
         const auto user = *discord.GetUser(data.Interaction->User.ID);
-        lbl->set_markup(
-            get_author_markup(user.ID, data.GuildID.has_value() ? *data.GuildID : Snowflake::Invalid) +
-            " used <span color='#697ec4'>/" +
-            Glib::Markup::escape_text(data.Interaction->Name) +
-            "</span>");
+
+        if (data.GuildID.has_value()) {
+            lbl->set_markup(get_author_markup(user.ID, *data.GuildID) +
+                            " used <span color='#697ec4'>/" +
+                            Glib::Markup::escape_text(data.Interaction->Name) +
+                            "</span>");
+        } else {
+            lbl->set_markup(user.GetEscapedBoldString<false>());
+        }
     } else if (data.ReferencedMessage.has_value()) {
         if (data.ReferencedMessage.value().get() == nullptr) {
             lbl->set_markup("<i>deleted message</i>");
diff --git a/discord/store.hpp b/discord/store.hpp
index 23d2c0d..e3713eb 100644
--- a/discord/store.hpp
+++ b/discord/store.hpp
@@ -156,5 +156,5 @@ inline void Store::Get(sqlite3_stmt *stmt, int index, std::optional<T> &out) con
 template<typename T>
 inline typename std::enable_if<std::is_enum<T>::value, void>::type
 Store::Get(sqlite3_stmt *stmt, int index, T &out) const {
-    out = static_cast<typename T>(sqlite3_column_int(stmt, index));
+    out = static_cast<T>(sqlite3_column_int(stmt, index));
 }