diff --git a/app/controllers/spree/admin/payment_methods_controller_decorator.rb b/app/controllers/spree/admin/payment_methods_controller_decorator.rb
index 7941deb9ee..963b61fa81 100644
--- a/app/controllers/spree/admin/payment_methods_controller_decorator.rb
+++ b/app/controllers/spree/admin/payment_methods_controller_decorator.rb
@@ -1,6 +1,7 @@
 module Spree
   module Admin
     PaymentMethodsController.class_eval do
+      before_filter :force_environment, only: [:create, :update]
       skip_before_filter :load_resource, only: [:show_provider_preferences]
       before_filter :load_hubs, only: [:new, :edit, :update]
       create.before :load_hubs
@@ -46,6 +47,10 @@ module Spree
 
       private
 
+      def force_environment
+        params[:payment_method][:environment] = Rails.env unless spree_current_user.admin?
+      end
+
       def load_data
         if spree_current_user.admin? || Rails.env.test?
           @providers = Gateway.providers.sort{|p1, p2| p1.name <=> p2.name }