diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000000..8aab1edc58db
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,4 @@
+# Invoice Ninja Code of Conduct
+
+The development team has invested a tremendous amount of time and energy into this project. While we appreciate that bugs can be frustrating we ask that our community refrain from insults and snide remarks. We're happy to provide support to both our hosted and selfhosted communities but ask that feedback is always polite.
+
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 45374df2fb7a..6a6734e40718 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4274,12 +4274,12 @@ $LANG = array(
     'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.',
     'click_to_continue' => 'Click to continue',
 
-    'notification_invoice_sent_subject' => 'Invoice :invoice was created to :client',
-    'notification_invoice_viewed_subject' => 'Invoice :invoice was created for :client',
-    'notification_quote_sent_subject' => 'Quote :invoice was created to :client',
-    'notification_quote_viewed_subject' => 'Quote :invoice was created for :client',
-    'notification_credit_sent_subject' => 'Credit :invoice was created to :client',
-    'notification_credit_viewed_subject' => 'Credit :invoice was created for :client',
+    'notification_invoice_created_subject' => 'Invoice :invoice was created to :client',
+    'notification_invoice_created_subject' => 'Invoice :invoice was created for :client',
+    'notification_quote_created_subject' => 'Quote :invoice was created to :client',
+    'notification_quote_created_subject' => 'Quote :invoice was created for :client',
+    'notification_credit_created_subject' => 'Credit :invoice was created to :client',
+    'notification_credit_created_subject' => 'Credit :invoice was created for :client',
 );
 
 return $LANG;