diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 348e5bbc75a0..48ebccd6b4ec 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -168,7 +168,7 @@ class AccountController extends \BaseController
             );
             $recommendedGatewayArray['Other Options'] = $otherItem;
 
-            $gateways = Gateway::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get();
+            $gateways = Gateway::remember(DEFAULT_QUERY_CACHE)->where('payment_library_id', '=', 1)->orderBy('name')->get();
 
             foreach ($gateways as $gateway) {
                 $paymentLibrary = $gateway->paymentlibrary;
@@ -187,6 +187,7 @@ class AccountController extends \BaseController
                 'gateways' => $gateways,
                 'dropdownGateways' => Gateway::remember(DEFAULT_QUERY_CACHE)
                     ->where('recommended', '=', '0')
+                    ->where('payment_library_id', '=', 1)
                     ->orderBy('name')
                     ->get(),
                 'recommendedGateways' => $recommendedGatewayArray,
diff --git a/app/controllers/AppController.php b/app/controllers/AppController.php
index a7f02ab4bff0..1378c43c9c95 100644
--- a/app/controllers/AppController.php
+++ b/app/controllers/AppController.php
@@ -59,19 +59,19 @@ class AppController extends BaseController
             return Redirect::to('/setup')->withInput();
         }
 
-        $content = "<?php return 'development';";
+        $content = "<?php return 'production';";
         $fp = fopen(base_path()."/bootstrap/environment.php", 'w');
         fwrite($fp, $content);
         fclose($fp);
 
-        $configDir = app_path().'/config/development';
+        $configDir = app_path().'/config/production';
         if (!file_exists($configDir)) {
             mkdir($configDir);
         }
 
         foreach (['app' => $app, 'database' => $database, 'mail' => $mail] as $key => $config) {
             $content = '<?php return '.var_export($config, true).';';
-            $fp = fopen(app_path()."/config/development/{$key}.php", 'w');
+            $fp = fopen(app_path()."/config/production/{$key}.php", 'w');
             fwrite($fp, $content);
             fclose($fp);
         }
diff --git a/bootstrap/environment.default.php b/bootstrap/environment.default.php
index c12ddd0b5998..60409212e89a 100755
--- a/bootstrap/environment.default.php
+++ b/bootstrap/environment.default.php
@@ -1,4 +1,4 @@
 <?php
 
-return 'development';
+return 'production';