diff --git a/resources/views/character/_image_info.blade.php b/resources/views/character/_image_info.blade.php
index d39859c78c..b04b3e627a 100644
--- a/resources/views/character/_image_info.blade.php
+++ b/resources/views/character/_image_info.blade.php
@@ -177,10 +177,12 @@
                     <div class="alert alert-secondary">
                         [character={{ $character->slug }}]
                     </div>
-                    In a comment:
-                    <div class="alert alert-secondary">
-                        [{{ $character->fullName }}]({{ $character->url }})
-                    </div>
+                    @if (!config('lorekeeper.settings.wysiwyg_comments'))
+                        In a comment:
+                        <div class="alert alert-secondary">
+                            [{{ $character->fullName }}]({{ $character->url }})
+                        </div>
+                    @endif
                     <hr>
                     <div class="my-2">
                         <strong>For Thumbnails:</strong>
@@ -189,10 +191,12 @@
                     <div class="alert alert-secondary">
                         [charthumb={{ $character->slug }}]
                     </div>
-                    In a comment:
-                    <div class="alert alert-secondary">
-                        [![Thumbnail of {{ $character->fullName }}]({{ $character->image->thumbnailUrl }})]({{ $character->url }})
-                    </div>
+                    @if (!config('lorekeeper.settings.wysiwyg_comments'))
+                        In a comment:
+                        <div class="alert alert-secondary">
+                            [![Thumbnail of {{ $character->fullName }}]({{ $character->image->thumbnailUrl }})]({{ $character->url }})
+                        </div>
+                    @endif
                 </div>
             @endif
 
diff --git a/resources/views/comments/_actions.blade.php b/resources/views/comments/_actions.blade.php
index 17456eb71f..a95efe0c48 100644
--- a/resources/views/comments/_actions.blade.php
+++ b/resources/views/comments/_actions.blade.php
@@ -70,7 +70,7 @@ class="ml-2 d-none d-sm-inline-block">Delete</span></button>
                 <div class="modal-body">
                     <div class="form-group">
                         {!! Form::label('message', 'Update your message here:') !!}
-                        {!! Form::textarea('message', $comment->comment, ['class' => 'form-control ' . config('lorekeeper.settings.wysiwyg_comments') ? 'comment-wysiwyg' : '', 'rows' => 3, config('lorekeeper.settings.wysiwyg_comments') ? '' : 'required']) !!}
+                        {!! Form::textarea('message', $comment->comment, ['class' => 'form-control ' . (config('lorekeeper.settings.wysiwyg_comments') ? 'comment-wysiwyg' : ''), 'rows' => 3, config('lorekeeper.settings.wysiwyg_comments') ? '' : 'required']) !!}
                         <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown</a> cheatsheet.</small>
                     </div>
                 </div>
@@ -98,7 +98,7 @@ class="ml-2 d-none d-sm-inline-block">Delete</span></button>
                 <div class="modal-body">
                     <div class="form-group">
                         {!! Form::label('message', 'Enter your message here:') !!}
-                        {!! Form::textarea('message', null, ['class' => 'form-control ' . config('lorekeeper.settings.wysiwyg_comments') ? 'comment-wysiwyg' : '', 'rows' => 3, config('lorekeeper.settings.wysiwyg_comments') ? '' : 'required']) !!}
+                        {!! Form::textarea('message', null, ['class' => 'form-control ' . (config('lorekeeper.settings.wysiwyg_comments') ? 'comment-wysiwyg' : ''), 'rows' => 3, config('lorekeeper.settings.wysiwyg_comments') ? '' : 'required']) !!}
                         <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown</a> cheatsheet.</small>
                     </div>
                 </div>
diff --git a/resources/views/comments/_form.blade.php b/resources/views/comments/_form.blade.php
index 8b8a5ccd26..7b9d8d2a25 100644
--- a/resources/views/comments/_form.blade.php
+++ b/resources/views/comments/_form.blade.php
@@ -5,7 +5,9 @@
         <div class="form-group">
             {!! Form::label('message', 'Enter your message here:') !!}
             {!! Form::textarea('message', null, ['class' => 'form-control ' . (config('lorekeeper.settings.wysiwyg_comments') ? 'comment-wysiwyg' : ''), 'rows' => 5, config('lorekeeper.settings.wysiwyg_comments') ? '' : 'required']) !!}
-            <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown</a> cheatsheet.</small>
+            @if (!config('lorekeeper.settings.wysiwyg_comments'))
+                <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown</a> cheatsheet.</small>
+            @endif
         </div>
 
         {!! Form::submit('Submit', ['class' => 'btn btn-sm btn-outline-success text-uppercase']) !!}
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 463e0533c8..093323b96e 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -68,7 +68,9 @@
 @endisset
 
 @auth
-    @include('comments._form')
+    @include('comments._form', [
+        'compact' => isset($type) && $type == 'Staff-Staff' && config('lorekeeper.settings.wysiwyg_comments') ? true : false,
+    ])
 @else
     <div class="card mt-3">
         <div class="card-body">
diff --git a/resources/views/galleries/submission.blade.php b/resources/views/galleries/submission.blade.php
index fd0b51b416..6168709716 100644
--- a/resources/views/galleries/submission.blade.php
+++ b/resources/views/galleries/submission.blade.php
@@ -217,15 +217,17 @@
                     <div class="alert alert-secondary">
                         [thumb={{ $submission->id }}]
                     </div>
-                    In a comment:
-                    <div class="alert alert-secondary">
-                        @if (isset($submission->hash) && !isset($submission->content_warning))
-                            [![Image]({{ $submission->thumbnailUrl }})]({{ $submission->url }})
-                        @else
-                            [{{ $submission->displayTitle }} by {{ $submission->creditsPlain }}
-                            {{ isset($submission->hash) ? '(Art)' : '(Literature)' }}{{ isset($submission->content_warning) ? ' ・ **Content Warning:** ' . nl2br(htmlentities($submission->content_warning)) : '' }}]({{ $submission->url }})
-                        @endif
-                    </div>
+                    @if (!config('lorekeeper.settings.wysiwyg_comments'))
+                        In a comment:
+                        <div class="alert alert-secondary">
+                            @if (isset($submission->hash) && !isset($submission->content_warning))
+                                [![Image]({{ $submission->thumbnailUrl }})]({{ $submission->url }})
+                            @else
+                                [{{ $submission->displayTitle }} by {{ $submission->creditsPlain }}
+                                {{ isset($submission->hash) ? '(Art)' : '(Literature)' }}{{ isset($submission->content_warning) ? ' ・ **Content Warning:** ' . nl2br(htmlentities($submission->content_warning)) : '' }}]({{ $submission->url }})
+                            @endif
+                        </div>
+                    @endif
                 </div>
             </div>
         </div>
diff --git a/resources/views/user/_profile_content.blade.php b/resources/views/user/_profile_content.blade.php
index b4e3a6e419..7f32ea270e 100644
--- a/resources/views/user/_profile_content.blade.php
+++ b/resources/views/user/_profile_content.blade.php
@@ -162,20 +162,24 @@
                 <div class="alert alert-secondary">
                     {{ '@' . $user->name }}
                 </div>
-                In a comment:
-                <div class="alert alert-secondary">
-                    [{{ $user->name }}]({{ $user->url }})
-                </div>
+                @if (!config('lorekeeper.settings.wysiwyg_comments'))
+                    In a comment:
+                    <div class="alert alert-secondary">
+                        [{{ $user->name }}]({{ $user->url }})
+                    </div>
+                @endif
                 <hr>
                 <div class="my-2"><strong>For Names and Avatars:</strong></div>
                 In the rich text editor:
                 <div class="alert alert-secondary">
                     {{ '%' . $user->name }}
                 </div>
-                In a comment:
-                <div class="alert alert-secondary">
-                    [![{{ $user->name }}'s Avatar]({{ $user->avatarUrl }})]({{ $user->url }}) [{{ $user->name }}]({{ $user->url }})
-                </div>
+                @if (!config('lorekeeper.settings.wysiwyg_comments'))
+                    In a comment:
+                    <div class="alert alert-secondary">
+                        [![{{ $user->name }}'s Avatar]({{ $user->avatarUrl }})]({{ $user->url }}) [{{ $user->name }}]({{ $user->url }})
+                    </div>
+                @endif
             </div>
             @if (Auth::check() && Auth::user()->isStaff)
                 <div class="card-footer">