diff --git a/public/.well-known/security.txt b/public/.well-known/security.txt
index 0945cee4a9..bf8e6eec38 100644
--- a/public/.well-known/security.txt
+++ b/public/.well-known/security.txt
@@ -1,7 +1,7 @@
 # Please report security issues related to Firefly III
 # to me ASAP via the email address below.
 
-Contact: mailto:thegrumpydictator@gmail.com
+Contact: mailto:james@firefly-iii.org
 Encryption: https://keybase.io/jc5/pgp_keys.asc?fingerprint=90f546f13b81b67a1baa5dddc16961e655e74b5e
 Acknowledgements: https://github.com/firefly-iii/firefly-iii
 Signature: https://firefly-iii.org/.well-known/security.txt.sig
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
index a1d1233ac1..6c81a30729 100644
--- a/public/browserconfig.xml
+++ b/public/browserconfig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ browserconfig.xml
-  ~ Copyright (c) 2019 thegrumpydictator@gmail.com
+  ~ Copyright (c) 2019 james@firefly-iii.org
   ~
   ~ This file is part of Firefly III (https://github.com/firefly-iii).
   ~
diff --git a/public/index.php b/public/index.php
index 9fc7560e07..57d56e1064 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * index.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/css/app.css b/public/v1/css/app.css
index 46021e11dc..702551f4d1 100644
--- a/public/v1/css/app.css
+++ b/public/v1/css/app.css
@@ -1,6 +1,6 @@
 /*
  * app.css
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/css/firefly.css b/public/v1/css/firefly.css
index a4fff20c5c..57aa710077 100644
--- a/public/v1/css/firefly.css
+++ b/public/v1/css/firefly.css
@@ -1,6 +1,6 @@
 /*
  * firefly.css
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/css/gf-roboto.css b/public/v1/css/gf-roboto.css
index 4707b0268d..ac13c4fa68 100644
--- a/public/v1/css/gf-roboto.css
+++ b/public/v1/css/gf-roboto.css
@@ -1,6 +1,6 @@
 /*
  * gf-roboto.css
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/css/gf-source.css b/public/v1/css/gf-source.css
index cdda1532b1..91e8c2c8f5 100644
--- a/public/v1/css/gf-source.css
+++ b/public/v1/css/gf-source.css
@@ -1,6 +1,6 @@
 /*
  * gf-source.css
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/accounts/create.js b/public/v1/js/ff/accounts/create.js
index 6f88d27495..7940fe5cc7 100644
--- a/public/v1/js/ff/accounts/create.js
+++ b/public/v1/js/ff/accounts/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/accounts/edit-reconciliation.js b/public/v1/js/ff/accounts/edit-reconciliation.js
index e68701f7fa..591721434b 100644
--- a/public/v1/js/ff/accounts/edit-reconciliation.js
+++ b/public/v1/js/ff/accounts/edit-reconciliation.js
@@ -1,6 +1,6 @@
 /*
  * edit-reconciliation.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/accounts/edit.js b/public/v1/js/ff/accounts/edit.js
index 1a58f45543..55915cd5b5 100644
--- a/public/v1/js/ff/accounts/edit.js
+++ b/public/v1/js/ff/accounts/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/accounts/reconcile.js b/public/v1/js/ff/accounts/reconcile.js
index c803d1924d..3cd50df687 100644
--- a/public/v1/js/ff/accounts/reconcile.js
+++ b/public/v1/js/ff/accounts/reconcile.js
@@ -1,6 +1,6 @@
 /*
  * reconcile.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/accounts/show.js b/public/v1/js/ff/accounts/show.js
index db9ef2a598..509b42ce5a 100644
--- a/public/v1/js/ff/accounts/show.js
+++ b/public/v1/js/ff/accounts/show.js
@@ -1,6 +1,6 @@
 /*
  * show.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/admin/update/index.js b/public/v1/js/ff/admin/update/index.js
index b369180a1f..de2096ff70 100644
--- a/public/v1/js/ff/admin/update/index.js
+++ b/public/v1/js/ff/admin/update/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/bills/create.js b/public/v1/js/ff/bills/create.js
index 2011c9aee0..4ee97b5474 100644
--- a/public/v1/js/ff/bills/create.js
+++ b/public/v1/js/ff/bills/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/bills/edit.js b/public/v1/js/ff/bills/edit.js
index 9af6eb5b4e..1050d4c4da 100644
--- a/public/v1/js/ff/bills/edit.js
+++ b/public/v1/js/ff/bills/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/bills/show.js b/public/v1/js/ff/bills/show.js
index dcdaf49d9c..d49e608f3d 100644
--- a/public/v1/js/ff/bills/show.js
+++ b/public/v1/js/ff/bills/show.js
@@ -1,6 +1,6 @@
 /*
  * show.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/budgets/create.js b/public/v1/js/ff/budgets/create.js
index 05b73755f2..79ac07ac9c 100644
--- a/public/v1/js/ff/budgets/create.js
+++ b/public/v1/js/ff/budgets/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/budgets/edit.js b/public/v1/js/ff/budgets/edit.js
index c605339393..536c28a7e6 100644
--- a/public/v1/js/ff/budgets/edit.js
+++ b/public/v1/js/ff/budgets/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/budgets/index.js b/public/v1/js/ff/budgets/index.js
index 3cc24160f2..7a57008a43 100644
--- a/public/v1/js/ff/budgets/index.js
+++ b/public/v1/js/ff/budgets/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/budgets/show.js b/public/v1/js/ff/budgets/show.js
index b9904a35b4..44683f7284 100644
--- a/public/v1/js/ff/budgets/show.js
+++ b/public/v1/js/ff/budgets/show.js
@@ -1,6 +1,6 @@
 /*
  * show.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/categories/create.js b/public/v1/js/ff/categories/create.js
index 4b43a93fa4..cb315a965d 100644
--- a/public/v1/js/ff/categories/create.js
+++ b/public/v1/js/ff/categories/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/categories/edit.js b/public/v1/js/ff/categories/edit.js
index c605339393..536c28a7e6 100644
--- a/public/v1/js/ff/categories/edit.js
+++ b/public/v1/js/ff/categories/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/categories/index.js b/public/v1/js/ff/categories/index.js
index 24aadc4a1e..0d8e1e589f 100644
--- a/public/v1/js/ff/categories/index.js
+++ b/public/v1/js/ff/categories/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/categories/show-by-date.js b/public/v1/js/ff/categories/show-by-date.js
index ccb63cdbea..7bc4f44a9b 100644
--- a/public/v1/js/ff/categories/show-by-date.js
+++ b/public/v1/js/ff/categories/show-by-date.js
@@ -1,6 +1,6 @@
 /*
  * show-by-date.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/categories/show.js b/public/v1/js/ff/categories/show.js
index 9eb0dd12f5..86a2fca6bd 100644
--- a/public/v1/js/ff/categories/show.js
+++ b/public/v1/js/ff/categories/show.js
@@ -1,6 +1,6 @@
 /*
  * show.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/charts.defaults.js b/public/v1/js/ff/charts.defaults.js
index daadaf3c57..5d553b4d2d 100644
--- a/public/v1/js/ff/charts.defaults.js
+++ b/public/v1/js/ff/charts.defaults.js
@@ -1,6 +1,6 @@
 /*
  * charts.defaults.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/charts.js b/public/v1/js/ff/charts.js
index 9061fab523..737bcadfe6 100644
--- a/public/v1/js/ff/charts.js
+++ b/public/v1/js/ff/charts.js
@@ -1,6 +1,6 @@
 /*
  * charts.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/common/autocomplete.js b/public/v1/js/ff/common/autocomplete.js
index 777fffde95..be4598a2d8 100644
--- a/public/v1/js/ff/common/autocomplete.js
+++ b/public/v1/js/ff/common/autocomplete.js
@@ -1,6 +1,6 @@
 /*
  * autocomplete.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/export/index.js b/public/v1/js/ff/export/index.js
index 3d4fae6519..69f60e3bd9 100644
--- a/public/v1/js/ff/export/index.js
+++ b/public/v1/js/ff/export/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/firefly.js b/public/v1/js/ff/firefly.js
index cec129f750..edd31052f1 100644
--- a/public/v1/js/ff/firefly.js
+++ b/public/v1/js/ff/firefly.js
@@ -1,6 +1,6 @@
 /*
  * firefly.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/guest.js b/public/v1/js/ff/guest.js
index dff352d7c5..d1edd32f0a 100644
--- a/public/v1/js/ff/guest.js
+++ b/public/v1/js/ff/guest.js
@@ -1,6 +1,6 @@
 /*
  * guest.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/help.js b/public/v1/js/ff/help.js
index a4cfe2ff30..f8fcf650af 100644
--- a/public/v1/js/ff/help.js
+++ b/public/v1/js/ff/help.js
@@ -1,6 +1,6 @@
 /*
  * help.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/import/file/configure-upload.js b/public/v1/js/ff/import/file/configure-upload.js
index 07b9b958b9..d07f600ae3 100644
--- a/public/v1/js/ff/import/file/configure-upload.js
+++ b/public/v1/js/ff/import/file/configure-upload.js
@@ -1,6 +1,6 @@
 /*
  * configure-upload.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/import/status.js b/public/v1/js/ff/import/status.js
index 371ad13e25..911a84063e 100644
--- a/public/v1/js/ff/import/status.js
+++ b/public/v1/js/ff/import/status.js
@@ -1,6 +1,6 @@
 /*
  * status.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/import/status_v2.js b/public/v1/js/ff/import/status_v2.js
index 7b9bd0d9d7..e1e7a7f588 100644
--- a/public/v1/js/ff/import/status_v2.js
+++ b/public/v1/js/ff/import/status_v2.js
@@ -1,6 +1,6 @@
 /*
  * status_v2.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/index.js b/public/v1/js/ff/index.js
index 2b28efbbb1..d2d2b5e68f 100644
--- a/public/v1/js/ff/index.js
+++ b/public/v1/js/ff/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/install/index.js b/public/v1/js/ff/install/index.js
index 0ff20107fd..49570f5475 100644
--- a/public/v1/js/ff/install/index.js
+++ b/public/v1/js/ff/install/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/intro/intro.js b/public/v1/js/ff/intro/intro.js
index 36d6b934b6..2552c48aec 100644
--- a/public/v1/js/ff/intro/intro.js
+++ b/public/v1/js/ff/intro/intro.js
@@ -1,6 +1,6 @@
 /*
  * intro.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/list/groups.js b/public/v1/js/ff/list/groups.js
index bed3428cec..dc512ab66f 100644
--- a/public/v1/js/ff/list/groups.js
+++ b/public/v1/js/ff/list/groups.js
@@ -1,6 +1,6 @@
 /*
  * groups.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/piggy-banks/create.js b/public/v1/js/ff/piggy-banks/create.js
index 2011c9aee0..4ee97b5474 100644
--- a/public/v1/js/ff/piggy-banks/create.js
+++ b/public/v1/js/ff/piggy-banks/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/piggy-banks/edit.js b/public/v1/js/ff/piggy-banks/edit.js
index 9af6eb5b4e..1050d4c4da 100644
--- a/public/v1/js/ff/piggy-banks/edit.js
+++ b/public/v1/js/ff/piggy-banks/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/piggy-banks/index.js b/public/v1/js/ff/piggy-banks/index.js
index e42d9a59bc..87a4af98d9 100644
--- a/public/v1/js/ff/piggy-banks/index.js
+++ b/public/v1/js/ff/piggy-banks/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/piggy-banks/show.js b/public/v1/js/ff/piggy-banks/show.js
index 3aa619de5a..f6d41064ce 100644
--- a/public/v1/js/ff/piggy-banks/show.js
+++ b/public/v1/js/ff/piggy-banks/show.js
@@ -1,6 +1,6 @@
 /*
  * show.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/preferences/index.js b/public/v1/js/ff/preferences/index.js
index 942e0e0037..ad3a19aa9f 100644
--- a/public/v1/js/ff/preferences/index.js
+++ b/public/v1/js/ff/preferences/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/recurring/create.js b/public/v1/js/ff/recurring/create.js
index ab2e45a63d..f9a7943608 100644
--- a/public/v1/js/ff/recurring/create.js
+++ b/public/v1/js/ff/recurring/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/recurring/edit.js b/public/v1/js/ff/recurring/edit.js
index 0b2fe47c6f..66d15bdda8 100644
--- a/public/v1/js/ff/recurring/edit.js
+++ b/public/v1/js/ff/recurring/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/all.js b/public/v1/js/ff/reports/all.js
index 55aa8e55e5..bf525cc941 100644
--- a/public/v1/js/ff/reports/all.js
+++ b/public/v1/js/ff/reports/all.js
@@ -1,6 +1,6 @@
 /*
  * all.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/audit/all.js b/public/v1/js/ff/reports/audit/all.js
index e29d91245b..e52c7a4941 100644
--- a/public/v1/js/ff/reports/audit/all.js
+++ b/public/v1/js/ff/reports/audit/all.js
@@ -1,6 +1,6 @@
 /*
  * all.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/budget/month.js b/public/v1/js/ff/reports/budget/month.js
index a9573c77a3..e4b7070c1d 100644
--- a/public/v1/js/ff/reports/budget/month.js
+++ b/public/v1/js/ff/reports/budget/month.js
@@ -1,6 +1,6 @@
 /*
  * month.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/category/month.js b/public/v1/js/ff/reports/category/month.js
index 47dd1cbeda..838c7b4093 100644
--- a/public/v1/js/ff/reports/category/month.js
+++ b/public/v1/js/ff/reports/category/month.js
@@ -1,6 +1,6 @@
 /*
  * month.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/default/all.js b/public/v1/js/ff/reports/default/all.js
index d08ecb9d1e..22767a711e 100644
--- a/public/v1/js/ff/reports/default/all.js
+++ b/public/v1/js/ff/reports/default/all.js
@@ -1,6 +1,6 @@
 /*
  * all.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/default/month.js b/public/v1/js/ff/reports/default/month.js
index 0945866089..64b4e80aa5 100644
--- a/public/v1/js/ff/reports/default/month.js
+++ b/public/v1/js/ff/reports/default/month.js
@@ -1,6 +1,6 @@
 /*
  * month.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/default/multi-year.js b/public/v1/js/ff/reports/default/multi-year.js
index e21ea8cfe7..969dbcb0c6 100644
--- a/public/v1/js/ff/reports/default/multi-year.js
+++ b/public/v1/js/ff/reports/default/multi-year.js
@@ -1,6 +1,6 @@
 /*
  * multi-year.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/default/year.js b/public/v1/js/ff/reports/default/year.js
index 7fd7283218..21caf20aa9 100644
--- a/public/v1/js/ff/reports/default/year.js
+++ b/public/v1/js/ff/reports/default/year.js
@@ -1,6 +1,6 @@
 /*
  * year.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/double/month.js b/public/v1/js/ff/reports/double/month.js
index ebc1c2439c..42bc66a657 100644
--- a/public/v1/js/ff/reports/double/month.js
+++ b/public/v1/js/ff/reports/double/month.js
@@ -1,6 +1,6 @@
 /*
  * month.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/index.js b/public/v1/js/ff/reports/index.js
index f82f8d0b91..f1ce2fdc75 100644
--- a/public/v1/js/ff/reports/index.js
+++ b/public/v1/js/ff/reports/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/reports/tag/month.js b/public/v1/js/ff/reports/tag/month.js
index 180c3f388a..0247d5a50e 100644
--- a/public/v1/js/ff/reports/tag/month.js
+++ b/public/v1/js/ff/reports/tag/month.js
@@ -1,6 +1,6 @@
 /*
  * month.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/rule-groups/create.js b/public/v1/js/ff/rule-groups/create.js
index fd4e4cffaa..253bf321cc 100644
--- a/public/v1/js/ff/rule-groups/create.js
+++ b/public/v1/js/ff/rule-groups/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/rule-groups/edit.js b/public/v1/js/ff/rule-groups/edit.js
index 506d330ea9..3a58a30762 100644
--- a/public/v1/js/ff/rule-groups/edit.js
+++ b/public/v1/js/ff/rule-groups/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/rules/create-edit.js b/public/v1/js/ff/rules/create-edit.js
index f1bd6a7239..4a39675c43 100644
--- a/public/v1/js/ff/rules/create-edit.js
+++ b/public/v1/js/ff/rules/create-edit.js
@@ -1,6 +1,6 @@
 /*
  * create-edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/rules/index.js b/public/v1/js/ff/rules/index.js
index 93d36f4fa9..ce4c437e46 100644
--- a/public/v1/js/ff/rules/index.js
+++ b/public/v1/js/ff/rules/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/rules/select-transactions.js b/public/v1/js/ff/rules/select-transactions.js
index a6bc6067c3..ef66d2d176 100644
--- a/public/v1/js/ff/rules/select-transactions.js
+++ b/public/v1/js/ff/rules/select-transactions.js
@@ -1,6 +1,6 @@
 /*
  * select-transactions.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/search/index.js b/public/v1/js/ff/search/index.js
index 5ff02945ee..5bc8ea32c5 100644
--- a/public/v1/js/ff/search/index.js
+++ b/public/v1/js/ff/search/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/tags/create-edit.js b/public/v1/js/ff/tags/create-edit.js
index 2c2e62ec48..986ce5e4f9 100644
--- a/public/v1/js/ff/tags/create-edit.js
+++ b/public/v1/js/ff/tags/create-edit.js
@@ -1,6 +1,6 @@
     /*
  * create-edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/tags/index.js b/public/v1/js/ff/tags/index.js
index 7840b50762..0101e9dc55 100644
--- a/public/v1/js/ff/tags/index.js
+++ b/public/v1/js/ff/tags/index.js
@@ -1,6 +1,6 @@
 /*
  * index.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/tags/show.js b/public/v1/js/ff/tags/show.js
index 12a153b96b..4f9ff7d401 100644
--- a/public/v1/js/ff/tags/show.js
+++ b/public/v1/js/ff/tags/show.js
@@ -1,6 +1,6 @@
 /*
  * show.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/convert.js b/public/v1/js/ff/transactions/convert.js
index ceef95118d..e8e8c4c32b 100644
--- a/public/v1/js/ff/transactions/convert.js
+++ b/public/v1/js/ff/transactions/convert.js
@@ -1,6 +1,6 @@
 /*
  * convert.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/create.js b/public/v1/js/ff/transactions/create.js
index 424056e281..f5fcab4d67 100644
--- a/public/v1/js/ff/transactions/create.js
+++ b/public/v1/js/ff/transactions/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/list.js b/public/v1/js/ff/transactions/list.js
index e638e7c613..aec0630d3c 100644
--- a/public/v1/js/ff/transactions/list.js
+++ b/public/v1/js/ff/transactions/list.js
@@ -1,6 +1,6 @@
 /*
  * list.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/mass/edit-bulk.js b/public/v1/js/ff/transactions/mass/edit-bulk.js
index 5ecb6a0cea..e6a0c71dfd 100644
--- a/public/v1/js/ff/transactions/mass/edit-bulk.js
+++ b/public/v1/js/ff/transactions/mass/edit-bulk.js
@@ -1,6 +1,6 @@
 /*
  * edit-bulk.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/mass/edit.js b/public/v1/js/ff/transactions/mass/edit.js
index 04fb916873..923e3283f6 100644
--- a/public/v1/js/ff/transactions/mass/edit.js
+++ b/public/v1/js/ff/transactions/mass/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/show.js b/public/v1/js/ff/transactions/show.js
index b377f56ce5..15df60e97a 100644
--- a/public/v1/js/ff/transactions/show.js
+++ b/public/v1/js/ff/transactions/show.js
@@ -1,6 +1,6 @@
 /*
  * show.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/single/common.js b/public/v1/js/ff/transactions/single/common.js
index 7bd201ef69..a053b62343 100644
--- a/public/v1/js/ff/transactions/single/common.js
+++ b/public/v1/js/ff/transactions/single/common.js
@@ -1,6 +1,6 @@
 /*
  * common.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/single/create.js b/public/v1/js/ff/transactions/single/create.js
index 36a64c2b69..c357694e82 100644
--- a/public/v1/js/ff/transactions/single/create.js
+++ b/public/v1/js/ff/transactions/single/create.js
@@ -1,6 +1,6 @@
 /*
  * create.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/single/edit.js b/public/v1/js/ff/transactions/single/edit.js
index c017a2ea63..d5a0845165 100644
--- a/public/v1/js/ff/transactions/single/edit.js
+++ b/public/v1/js/ff/transactions/single/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/public/v1/js/ff/transactions/split/edit.js b/public/v1/js/ff/transactions/split/edit.js
index 489bef8f45..aba5b12140 100644
--- a/public/v1/js/ff/transactions/split/edit.js
+++ b/public/v1/js/ff/transactions/split/edit.js
@@ -1,6 +1,6 @@
 /*
  * edit.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/de_DE/help.php b/resources/lang/de_DE/help.php
index e0f87c3acd..d5c5c11c54 100644
--- a/resources/lang/de_DE/help.php
+++ b/resources/lang/de_DE/help.php
@@ -2,7 +2,7 @@
 
 /**
  * help.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2018 james@firefly-iii.org
  *
  * This file is part of Firefly III.
  *
@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 /**
  * help.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (C) 2016 james@firefly-iii.org
  *
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
diff --git a/resources/lang/fr_FR/help.php b/resources/lang/fr_FR/help.php
index 3df7080096..736f8b0b80 100644
--- a/resources/lang/fr_FR/help.php
+++ b/resources/lang/fr_FR/help.php
@@ -2,7 +2,7 @@
 
 /**
  * help.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2018 james@firefly-iii.org
  *
  * This file is part of Firefly III.
  *
@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 /**
  * help.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (C) 2016 james@firefly-iii.org
  *
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
diff --git a/resources/lang/nl_NL/help.php b/resources/lang/nl_NL/help.php
index c89e127c12..d87c682960 100644
--- a/resources/lang/nl_NL/help.php
+++ b/resources/lang/nl_NL/help.php
@@ -2,7 +2,7 @@
 
 /**
  * help.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2018 james@firefly-iii.org
  *
  * This file is part of Firefly III.
  *
@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 /**
  * help.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (C) 2016 james@firefly-iii.org
  *
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
diff --git a/resources/lang/pl_PL/help.php b/resources/lang/pl_PL/help.php
index 25fe523ab7..9043ebf289 100644
--- a/resources/lang/pl_PL/help.php
+++ b/resources/lang/pl_PL/help.php
@@ -2,7 +2,7 @@
 
 /**
  * help.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
+ * Copyright (c) 2018 james@firefly-iii.org
  *
  * This file is part of Firefly III.
  *
@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 /**
  * help.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (C) 2016 james@firefly-iii.org
  *
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
diff --git a/routes/api.php b/routes/api.php
index 0bfe33e91c..f8b1024371 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -2,7 +2,7 @@
 
 /**
  * api.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 5dcd657148..947a33a519 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * breadcrumbs.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/routes/channels.php b/routes/channels.php
index a9fee070a9..99f71025cd 100644
--- a/routes/channels.php
+++ b/routes/channels.php
@@ -2,7 +2,7 @@
 
 /**
  * channels.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/routes/console.php b/routes/console.php
index d922fde31e..a41e05185a 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -2,7 +2,7 @@
 
 /**
  * console.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/routes/web.php b/routes/web.php
index db9a64ee44..ecb285ccd7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * web.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index 8bf361526d..51c1a775d4 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * CreatesApplication.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/tests/TestCase.php b/tests/TestCase.php
index bfd490c966..fdaf689aef 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,7 +2,7 @@
 
 /**
  * TestCase.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *