diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php
index 57af25e609..a87dcbbb45 100644
--- a/framework/core/src/Forum/ForumServiceProvider.php
+++ b/framework/core/src/Forum/ForumServiceProvider.php
@@ -148,7 +148,9 @@ public function boot(Container $container, Dispatcher $events, Factory $view): v
         $view->share([
             'translator' => $container->make(TranslatorInterface::class),
             'settings' => $container->make(SettingsRepositoryInterface::class),
-            'formatter' => $container->make(Formatter::class)
+            'formatter' => $container->make(Formatter::class),
+            'greeting' => true,
+            'signofff' => true
         ]);
 
         $events->listen(
diff --git a/framework/core/views/email/html/base.blade.php b/framework/core/views/email/html/base.blade.php
index cab4e964ae..b9c7900b9f 100644
--- a/framework/core/views/email/html/base.blade.php
+++ b/framework/core/views/email/html/base.blade.php
@@ -61,15 +61,19 @@
 </div>
 
 <div class="content">
+    @if(isset($greeting) && $greeting !== false)
     <div class="greeting">
         <p>{!! $translator->trans('core.email.greeting', ['displayName' => $username]) !!}</p>
     </div>
+    @endif
     <div class="main-content">
         @yield('content')
     </div>
+    @if(isset($signoff) && $signoff !== false)
     <div class="signoff">
         <p>{!! $translator->trans('core.email.signoff', ['forumTitle' => $settings->get('forum_title')]) !!}</p>
     </div>
+    @endif
 </div>
 
 <div class="footer">
diff --git a/framework/core/views/email/plain/base.blade.php b/framework/core/views/email/plain/base.blade.php
index 1bc040a72f..ec2fbf1378 100644
--- a/framework/core/views/email/plain/base.blade.php
+++ b/framework/core/views/email/plain/base.blade.php
@@ -1,12 +1,14 @@
 @yield('header')
 
-
+@if(isset($greeting) && $greeting !== false)
 {{ $translator->trans('core.email.greeting', ['displayName' => $username]) }}
+@endif
 
 @yield('content')
 
+@if(isset($signoff) && $signoff !== false)
 - {{ $translator->trans('core.email.signoff', ['forumTitle' => $settings->get('forum_title')]) }} -
-
+@endif
 
 
 @yield('footer')