diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php
index 123d68b96..5e97d9ebd 100644
--- a/app/Http/Controllers/ContactController.php
+++ b/app/Http/Controllers/ContactController.php
@@ -5,11 +5,13 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use Auth;
 use App\Contact;
+use App\Jobs\ContactPipeline\ContactPipeline;
 
 class ContactController extends Controller
 {
 	public function show(Request $request)
 	{
+		abort_if(!config('instance.email') && !config('instance.contact.enabled'), 404);
 		return view('site.contact');
 	}
 	
@@ -42,6 +44,8 @@ class ContactController extends Controller
 		$contact->message = $message;
 		$contact->save();
 
+		ContactPipeline::dispatchNow($contact);
+
 		return redirect()->back()->with('status', 'Success - Your message has been sent to admins.');
 	}
 }