diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index 5fc4d55c1a..691e01c469 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -89,6 +89,10 @@ class AccountGatewayController extends BaseController
                                     ->orderBy('name')->get();
         $data['hiddenFields'] = Gateway::$hiddenFields;
 
+        if ( ! \Request::secure() && ! Utils::isNinjaDev()) {
+            Session::flash('warning', trans('texts.enable_https'));
+        }
+
         return View::make('accounts.account_gateway', $data);
     }
 
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index 264c485e61..bfda7bcb49 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -35,7 +35,7 @@ class StartupCheck
 
         // Ensure all request are over HTTPS in production
         if (Utils::requireHTTPS() && !Request::secure()) {
-            //return Redirect::secure(Request::path());
+            return Redirect::secure(Request::path());
         }
 
         // If the database doens't yet exist we'll skip the rest
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 76781a31b7..47524743b6 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -1141,5 +1141,6 @@ return array(
     'all_pages_header' => 'Show header on',
     'all_pages_footer' => 'Show footer on',
     'invoice_currency' => 'Invoice Currency',
+    'enable_https' => 'We strongly recommend using HTTPS to accept payments online.'
 
 );