diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php
index a87dcbbb45..a4db2dad6c 100644
--- a/framework/core/src/Forum/ForumServiceProvider.php
+++ b/framework/core/src/Forum/ForumServiceProvider.php
@@ -149,8 +149,6 @@ public function boot(Container $container, Dispatcher $events, Factory $view): v
'translator' => $container->make(TranslatorInterface::class),
'settings' => $container->make(SettingsRepositoryInterface::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 b9c7900b9f..b847fd67b1 100644
--- a/framework/core/views/email/html/base.blade.php
+++ b/framework/core/views/email/html/base.blade.php
@@ -61,18 +61,18 @@
- @if(isset($greeting) && $greeting !== false)
-
-
{!! $translator->trans('core.email.greeting', ['displayName' => $username]) !!}
-
+ @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')]) !!}
-
+ @if(!isset($signoff) || $signoff !== false)
+
+
{!! $translator->trans('core.email.signoff', ['forumTitle' => $settings->get('forum_title')]) !!}
+
@endif
diff --git a/framework/core/views/email/plain/base.blade.php b/framework/core/views/email/plain/base.blade.php
index ec2fbf1378..6d7180d569 100644
--- a/framework/core/views/email/plain/base.blade.php
+++ b/framework/core/views/email/plain/base.blade.php
@@ -1,12 +1,12 @@
@yield('header')
-@if(isset($greeting) && $greeting !== false)
+@if(!isset($greeting) || $greeting !== false)
{{ $translator->trans('core.email.greeting', ['displayName' => $username]) }}
@endif
@yield('content')
-@if(isset($signoff) && $signoff !== false)
+@if(!isset($signoff) || $signoff !== false)
- {{ $translator->trans('core.email.signoff', ['forumTitle' => $settings->get('forum_title')]) }} -
@endif