diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 445d50f49052..d769d2ed5be9 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -88,10 +88,10 @@ class CheckData extends Command
         $this->info($this->log);
 
         if ($errorEmail) {
-            Mail::raw($this->log, function ($message) use ($errorEmail) {
+            Mail::raw($this->log, function ($message) use ($errorEmail, $database) {
                 $message->to($errorEmail)
                         ->from(CONTACT_EMAIL)
-                        ->subject('Check-Data: ' . strtoupper($this->isValid ? RESULT_SUCCESS : RESULT_FAILURE));
+                        ->subject("Check-Data [{$database}]: " . strtoupper($this->isValid ? RESULT_SUCCESS : RESULT_FAILURE));
             });
         } elseif (! $this->isValid) {
             throw new Exception('Check data failed!!');
diff --git a/app/Console/Commands/SendReminders.php b/app/Console/Commands/SendReminders.php
index 92334db4fefa..cb76a83ef9f0 100644
--- a/app/Console/Commands/SendReminders.php
+++ b/app/Console/Commands/SendReminders.php
@@ -87,10 +87,10 @@ class SendReminders extends Command
         $this->info('Done');
 
         if ($errorEmail = env('ERROR_EMAIL')) {
-            \Mail::raw('EOM', function ($message) use ($errorEmail) {
+            \Mail::raw('EOM', function ($message) use ($errorEmail, $database) {
                 $message->to($errorEmail)
                         ->from(CONTACT_EMAIL)
-                        ->subject('SendReminders: Finished successfully');
+                        ->subject("SendReminders [{$database}]: Finished successfully");
             });
         }
     }
diff --git a/app/Console/Commands/SendRenewalInvoices.php b/app/Console/Commands/SendRenewalInvoices.php
index ebb716347acb..ca0a11568cb7 100644
--- a/app/Console/Commands/SendRenewalInvoices.php
+++ b/app/Console/Commands/SendRenewalInvoices.php
@@ -107,10 +107,10 @@ class SendRenewalInvoices extends Command
         $this->info('Done');
 
         if ($errorEmail = env('ERROR_EMAIL')) {
-            \Mail::raw('EOM', function ($message) use ($errorEmail) {
+            \Mail::raw('EOM', function ($message) use ($errorEmail, $database) {
                 $message->to($errorEmail)
                         ->from(CONTACT_EMAIL)
-                        ->subject('SendRenewalInvoices: Finished successfully');
+                        ->subject("SendRenewalInvoices [{$database}]: Finished successfully");
             });
         }
     }
diff --git a/app/Constants.php b/app/Constants.php
index 8fd7434ffa7e..a6b4608de23f 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -291,7 +291,6 @@ if (! defined('APP_NAME')) {
     define('EVENT_DELETE_INVOICE', 9);
 
     define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN');
-    define('DEMO_ACCOUNT_ID', 'DEMO_ACCOUNT_ID');
     define('NINJA_ACCOUNT_KEY', env('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h'));
     define('NINJA_ACCOUNT_EMAIL', env('NINJA_ACCOUNT_EMAIL', 'contact@invoiceninja.com'));
     define('NINJA_LICENSE_ACCOUNT_KEY', 'AsFmBAeLXF0IKf7tmi0eiyZfmWW9hxMT');
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 15236634a71a..541924d5b118 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -97,25 +97,6 @@ class AccountController extends BaseController
         $this->paymentService = $paymentService;
     }
 
-    /**
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function demo()
-    {
-        $demoAccountId = Utils::getDemoAccountId();
-
-        if (! $demoAccountId) {
-            return Redirect::to('/');
-        }
-
-        $account = Account::find($demoAccountId);
-        $user = $account->users()->first();
-
-        Auth::login($user, true);
-
-        return Redirect::to('invoices/create');
-    }
-
     /**
      * @return \Illuminate\Http\RedirectResponse
      */
diff --git a/app/Http/Middleware/DatabaseLookup.php b/app/Http/Middleware/DatabaseLookup.php
index a74bdfe24a4b..5a93234f2b4b 100644
--- a/app/Http/Middleware/DatabaseLookup.php
+++ b/app/Http/Middleware/DatabaseLookup.php
@@ -4,6 +4,7 @@ namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
 use Closure;
+use App\Models\LookupAccount;
 use App\Models\LookupContact;
 use App\Models\LookupInvitation;
 use App\Models\LookupAccountToken;
@@ -37,6 +38,10 @@ class DatabaseLookup
             }
         } elseif ($guard == 'postmark') {
             LookupInvitation::setServerByField('message_id', request()->MessageID);
+        } elseif ($guard == 'account') {
+            if ($key = request()->account_key) {
+                LookupAccount::setServerByField('account_key', $key);
+            }
         } elseif ($guard == 'license') {
             config(['database.default' => DB_NINJA_1]);
         }
diff --git a/app/Http/routes.php b/app/Http/routes.php
index be3ee39fc245..f3ad76fb0d5a 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -83,7 +83,10 @@ Route::group(['middleware' => 'lookup:postmark'], function () {
     Route::post('/hook/email_opened', 'AppController@emailOpened');
 });
 
-Route::post('/payment_hook/{accountKey}/{gatewayId}', 'OnlinePaymentController@handlePaymentWebhook');
+Route::group(['middleware' => 'lookup:account'], function () {
+    Route::post('/payment_hook/{account_key}/{gateway_id}', 'OnlinePaymentController@handlePaymentWebhook');
+}
+
 //Route::post('/hook/bot/{platform?}', 'BotController@handleMessage');
 
 // Laravel auth routes
@@ -117,7 +120,6 @@ Route::group(['middleware' => ['lookup:contact']], function () {
 if (Utils::isNinja()) {
     Route::post('/signup/register', 'AccountController@doRegister');
     Route::get('/news_feed/{user_type}/{version}/', 'HomeController@newsFeed');
-    Route::get('/demo', 'AccountController@demo');
 }
 
 if (Utils::isReseller()) {