diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0d2b1edae7..badbdef1d5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -14,6 +14,11 @@ https://invoiceninja.github.io/docs/self-host-troubleshooting/ -->
 - Version: <!-- i.e. v4.5.25 / v5.0.30 -->
 - Environment: <!-- Docker/Shared Hosting/ZIP/Other -->
 
+## Interface
+- Flutter: []
+- React: []
+- Both: []
+
 ## Checklist
 - Can you replicate the issue on our v5 demo site https://demo.invoiceninja.com or https://react.invoicing.co/demo?
 - Have you searched existing issues?
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 183cbf5c8c..06502e3354 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -660,7 +660,7 @@ $LANG = array(
     'customize_help' => '<p>We use :pdfmake_link to define the invoice designs declaratively. The pdfmake :playground_link provides a great way to see the library in action.</p>
                         <p>If you need help figuring something out post a question to our :forum_link with the design you\'re using.</p>',
     'playground' => 'playground',
-    'support_forum' => 'support forum',
+    'support_forum' => 'Support Forums',
     'invoice_due_date' => 'Due Date',
     'quote_due_date' => 'Valid Until',
     'valid_until' => 'Valid Until',
diff --git a/tests/Unit/RecurringDateTest.php b/tests/Unit/RecurringDateTest.php
index 4321031b29..36c49e32b3 100644
--- a/tests/Unit/RecurringDateTest.php
+++ b/tests/Unit/RecurringDateTest.php
@@ -41,4 +41,19 @@ class RecurringDateTest extends TestCase
 
         $this->assertequals($trial_ends->format('Y-m-d'), '2021-12-03');
     }
+
+    public function testDateOverflowsForEndOfMonth()
+    {
+        $today = Carbon::parse('2022-01-31');
+
+        $next_month = $today->addMonthNoOverflow();
+
+        $this->assertEquals('2022-02-28', $next_month->format('Y-m-d'));
+
+        // $next_month = $today->addMonthNoOverflow();
+
+        // $this->assertEquals('2022-03-31', $next_month->format('Y-m-d'));
+
+    }
+
 }