diff --git a/app/Notifications/Internal/GeneralNotification.php b/app/Notifications/Internal/GeneralNotification.php
index 024175622..d00432ca9 100644
--- a/app/Notifications/Internal/GeneralNotification.php
+++ b/app/Notifications/Internal/GeneralNotification.php
@@ -19,7 +19,17 @@ class GeneralNotification extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        return [TelegramChannel::class, DiscordChannel::class];
+        $channels = [];
+        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+        $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+
+        if ($isDiscordEnabled) {
+            $channels[] = DiscordChannel::class;
+        }
+        if ($isTelegramEnabled) {
+            $channels[] = TelegramChannel::class;
+        }
+        return $channels;
     }
 
     public function toDiscord(): string
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
index d4abc66b0..90d975f22 100644
--- a/resources/views/auth/two-factor-challenge.blade.php
+++ b/resources/views/auth/two-factor-challenge.blade.php
@@ -20,7 +20,7 @@
                     </template>
                     <template x-if="showRecovery">
                         <div>
-                            <x-forms.input required type="text" name="recovery_code "
+                            <x-forms.input required type="text" name="recovery_code"
                                 label="{{ __('input.recovery_code') }}" />
                             <div class="pt-2 text-xs cursor-pointer hover:underline hover:text-white"
                                 x-on:click="showRecovery = !showRecovery">Use