diff --git a/abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl b/abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl
index ff1b44d1..05c98829 100644
--- a/abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl
+++ b/abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl
@@ -1,10 +1,10 @@
 {
     "embeds": [
         {
-            <#include "member_author">
-            <#include "member_avatar">
-            <@member_display_author member=memberNameDisplay/>,
+            <#include "user_author">
+            <@user_detail_author user=userDisplay/>,
             <#include "abstracto_color">,
+            <#assign reminderId=reminderDisplay.id>
             "description": "<@safe_include "remind_reminder_description"/>",
             "fields": [
                 {
@@ -13,18 +13,22 @@
                 },
                 {
                     "name": "<@safe_include "remind_reminder_note_field_title"/>",
-                    "value": "${reminder.text?json_string}"
-                },
+                    "value": "${reminderDisplay.text?json_string}"
+                }
+                <#if messageUrl?has_content>,
                 {
                     "name": "<@safe_include "remind_reminder_link_field_title"/>",
                     "value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
                 }
+                </#if>
             ]
         }
-    ],
-<#assign participantsMentions><#list reminderParticipants as participant>${participant.memberMention}<#sep>, </#list></#assign>
-    "additionalMessage": "${memberNameDisplay.memberMention?json_string} 🔔
+    ]
+<#if !reminderDisplay.userCommand>,
+<#assign participantsMentions><#if reminderParticipants?has_content><#list reminderParticipants as participant>${participant.memberMention}<#sep>, </#list></#if></#assign>
+    "additionalMessage": "${userDisplay.userMention?json_string} 🔔
 
 ${participantsMentions}
 "
+</#if>
 }
\ No newline at end of file
diff --git a/abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl b/abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl
index 69625335..6cf205a0 100644
--- a/abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl
+++ b/abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl
@@ -3,9 +3,8 @@
     "embeds": [
         {
             <#assign id>${reminder.id}</#assign>
-            <#include "member_author">
-            <#include "member_avatar">
-            <@member_display_author member=memberDisplay/>,
+            <#include "user_author">
+            <@user_detail_author user=userDisplay/>,
             <#include "abstracto_color">,
             <#assign reminderTargetDate><@format_instant_date_time instant=reminder.targetDate/></#assign>
             <#if message?has_content>
@@ -17,8 +16,11 @@
             </#if>
 
         }
-    ],
-    "additionalMessage": "${memberDisplay.memberMention?json_string}",
+    ]
+    <#if !reminder.userCommand>,
+    "additionalMessage": "${userDisplay.userMention?json_string}"
+    </#if>
+    <#if joinButtonId?has_content>,
     "buttons": [
         {
             "label": "<@safe_include "remind_reminder_join_button_label"/>",
@@ -29,4 +31,5 @@
             }
         }
     ]
+    </#if>
 }
\ No newline at end of file
diff --git a/abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl b/abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl
index 7f6b654d..0c7998f8 100644
--- a/abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl
+++ b/abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl
@@ -2,8 +2,8 @@
 {
     "embeds": [
         {
-            <#include "member_author">
-            <@member_author member=member/>,
+            <#include "user_author">
+            <@user_detail_author user=userDisplay/>,
             <#include "abstracto_color">,
             "title": {
                 "title": "<@safe_include "reminders_reminders_embed_title"/>"
@@ -17,7 +17,7 @@
                     <#assign id>${reminderDisplay.id}</#assign>
                     <#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.targetDate/></#assign>
                     <#assign reminderText=reminderDisplay.text/>
-                    <#assign messageLink=reminderDisplay.message.jumpUrl/>
+                    <#if !reminderDisplay.userCommand><#assign messageLink=reminderDisplay.message.jumpUrl/></#if>
                     <#assign joined=reminderDisplay.joined/>
                     <#assign joinedText><#if joined><@safe_include "reminder_joined_text"/></#if></#assign>
                     "name": "<@safe_include "reminders_reminder_field_title"/>",
diff --git a/translations/remind/src/main/resources/en_US/commands/remind/remind_reminder_description_en_US.ftl b/translations/remind/src/main/resources/en_US/commands/remind/remind_reminder_description_en_US.ftl
index ab010421..88af355e 100644
--- a/translations/remind/src/main/resources/en_US/commands/remind/remind_reminder_description_en_US.ftl
+++ b/translations/remind/src/main/resources/en_US/commands/remind/remind_reminder_description_en_US.ftl
@@ -1 +1 @@
-Reminder ID ${reminder.id?c}
\ No newline at end of file
+Reminder ID ${reminderId?c}
\ No newline at end of file
diff --git a/translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl b/translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl
index 8d5d3c28..868c27e7 100644
--- a/translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl
+++ b/translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl
@@ -1 +1 @@
-Due on ${reminderTargetDate} with text `${reminderText}` started [here](${messageLink}) ${joinedText}
\ No newline at end of file
+Due on ${reminderTargetDate} with text `${reminderText}`<#if messageLink?has_content> started [here](${messageLink})</#if> ${joinedText}
\ No newline at end of file