diff --git a/extensions/flags/js/src/admin/components/FlagsSettingsModal.js b/extensions/flags/js/src/admin/components/FlagsSettingsModal.js
index 3eba22408..fe80bba86 100644
--- a/extensions/flags/js/src/admin/components/FlagsSettingsModal.js
+++ b/extensions/flags/js/src/admin/components/FlagsSettingsModal.js
@@ -18,7 +18,7 @@ export default class FlagsSettingsModal extends SettingsModal {
       <div className="Form-group">
         <label className="checkbox">
           <input type="checkbox" bidi={this.setting('flarum-flags.can_flag_own')}/>
-          {app.translator.trans('flarum-flags.admin.settings.user_can_flag_own_posts')}
+          {app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label')}
         </label>
       </div>
     ];
diff --git a/extensions/flags/js/src/forum/components/FlagPostModal.js b/extensions/flags/js/src/forum/components/FlagPostModal.js
index d0cc1c8b6..3a1ff5aee 100644
--- a/extensions/flags/js/src/forum/components/FlagPostModal.js
+++ b/extensions/flags/js/src/forum/components/FlagPostModal.js
@@ -47,7 +47,7 @@ export default class FlagPostModal extends Modal {
                 <strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_off_topic_label')}</strong>
                 {app.translator.trans('flarum-flags.forum.flag_post.reason_off_topic_text')}
                 {this.reason() === 'off_topic' ? (
-                  <textarea className="FormControl" placeholder={app.translator.trans('flarum-flags.forum.flag_post.optional_details')} value={this.reasonDetail()} oninput={m.withAttr('value', this.reasonDetail)}></textarea>
+                  <textarea className="FormControl" placeholder={app.translator.trans('flarum-flags.forum.flag_post.reason_details_placeholder')} value={this.reasonDetail()} oninput={m.withAttr('value', this.reasonDetail)}></textarea>
                 ) : ''}
               </label>
 
@@ -58,7 +58,7 @@ export default class FlagPostModal extends Modal {
                   a: guidelinesUrl ? <a href={guidelinesUrl} target="_blank"/> : undefined
                 })}
                 {this.reason() === 'inappropriate' ? (
-                  <textarea className="FormControl" placeholder={app.translator.trans('flarum-flags.forum.flag_post.optional_details')} value={this.reasonDetail()} oninput={m.withAttr('value', this.reasonDetail)}></textarea>
+                  <textarea className="FormControl" placeholder={app.translator.trans('flarum-flags.forum.flag_post.reason_details_placeholder')} value={this.reasonDetail()} oninput={m.withAttr('value', this.reasonDetail)}></textarea>
                 ) : ''}
               </label>
 
@@ -67,7 +67,7 @@ export default class FlagPostModal extends Modal {
                 <strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_spam_label')}</strong>
                 {app.translator.trans('flarum-flags.forum.flag_post.reason_spam_text')}
                 {this.reason() === 'spam' ? (
-                  <textarea className="FormControl" placeholder={app.translator.trans('flarum-flags.forum.flag_post.optional_details')} value={this.reasonDetail()} oninput={m.withAttr('value', this.reasonDetail)}></textarea>
+                  <textarea className="FormControl" placeholder={app.translator.trans('flarum-flags.forum.flag_post.reason_details_placeholder')} value={this.reasonDetail()} oninput={m.withAttr('value', this.reasonDetail)}></textarea>
                 ) : ''}
               </label>
 
diff --git a/extensions/flags/src/Command/CreateFlagHandler.php b/extensions/flags/src/Command/CreateFlagHandler.php
index 29137d846..ea1c145be 100644
--- a/extensions/flags/src/Command/CreateFlagHandler.php
+++ b/extensions/flags/src/Command/CreateFlagHandler.php
@@ -75,7 +75,7 @@ class CreateFlagHandler
 
         if (array_get($data, 'attributes.reason') === null && array_get($data, 'attributes.reasonDetail') === '') {
             throw new ValidationException([
-                'message' => $this->translator->trans('flarum-flags.forum.flag_post.reason-needed')
+                'message' => $this->translator->trans('flarum-flags.forum.flag_post.reason_missing_message')
             ]);
         }