diff --git a/app/assets/javascripts/admin/order_cycle.js.erb.coffee b/app/assets/javascripts/admin/order_cycle.js.erb.coffee
index 6a7d565bae..608de85d8a 100644
--- a/app/assets/javascripts/admin/order_cycle.js.erb.coffee
+++ b/app/assets/javascripts/admin/order_cycle.js.erb.coffee
@@ -74,7 +74,8 @@ angular.module('admin.order_cycles', ['ngResource'])
     $scope.removeDistributionOfVariant = (variant_id) ->
       OrderCycle.removeDistributionOfVariant(variant_id)
 
-    $scope.submit = ->
+    $scope.submit = (event) ->
+      event.preventDefault()
       OrderCycle.create()
   ])
 
@@ -154,7 +155,8 @@ angular.module('admin.order_cycles', ['ngResource'])
     $scope.removeDistributionOfVariant = (variant_id) ->
       OrderCycle.removeDistributionOfVariant(variant_id)
 
-    $scope.submit = ->
+    $scope.submit = (event) ->
+      event.preventDefault()
       OrderCycle.update()
   ])
 
diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
index e2a60e424e..b93d464d74 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
@@ -38,6 +38,7 @@ angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl
   $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
     EnterpriseFee.forEnterprise(parseInt(enterprise_id))
 
-  $scope.submit = ->
+  $scope.submit = (event) ->
+    event.preventDefault()
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.create()
diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
index bcdaa64e91..84f2fcf74a 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -32,6 +32,7 @@ angular.module('admin.order_cycles').controller "AdminSimpleEditOrderCycleCtrl",
     $event.preventDefault()
     OrderCycle.removeCoordinatorFee(index)
 
-  $scope.submit = ->
+  $scope.submit = (event) ->
+    event.preventDefault()
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.update()
diff --git a/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee b/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
index 687a0164fa..40197452bf 100644
--- a/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
@@ -87,20 +87,21 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
     load: (order_cycle_id, callback=null) ->
       service = this
       OrderCycle.get {order_cycle_id: order_cycle_id}, (oc) ->
-    	  angular.extend(service.order_cycle, oc)
-    	  service.order_cycle.incoming_exchanges = []
-    	  service.order_cycle.outgoing_exchanges = []
-    	  for exchange in service.order_cycle.exchanges
-    	    if exchange.incoming
-    	      angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true})
-    	      delete(exchange.receiver_id)
-    	      service.order_cycle.incoming_exchanges.push(exchange)
-    
-    	    else
-    	      angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true})
-    	      delete(exchange.sender_id)
-    	      service.order_cycle.outgoing_exchanges.push(exchange)
-    
+        delete oc.$promise
+        delete oc.$resolved
+        angular.extend(service.order_cycle, oc)
+        service.order_cycle.incoming_exchanges = []
+        service.order_cycle.outgoing_exchanges = []
+        for exchange in service.order_cycle.exchanges
+          if exchange.incoming
+            angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true})
+            delete(exchange.receiver_id)
+            service.order_cycle.incoming_exchanges.push(exchange)
+          else
+            angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true})
+            delete(exchange.sender_id)
+            service.order_cycle.outgoing_exchanges.push(exchange)
+
         delete(service.order_cycle.exchanges)
         service.loaded = true
 
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index ff40cfbbbc..d4a6751b48 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -2,7 +2,7 @@
 
 - ng_controller = order_cycles_simple_view ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
 
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit()'} do |f|
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit($event)'} do |f|
   - if order_cycles_simple_view
     = render 'simple_form', f: f
   - else
diff --git a/app/views/admin/order_cycles/new.html.haml b/app/views/admin/order_cycles/new.html.haml
index 716e537874..817f790b19 100644
--- a/app/views/admin/order_cycles/new.html.haml
+++ b/app/views/admin/order_cycles/new.html.haml
@@ -2,7 +2,7 @@
 
 - ng_controller = order_cycles_simple_view ? 'AdminSimpleCreateOrderCycleCtrl' : 'AdminCreateOrderCycleCtrl'
 
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit()'} do |f|
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit($event)'} do |f|
   - if order_cycles_simple_view
     = render 'simple_form', f: f
   - else
diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index 7ecd2b4782..6a1e1be70f 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -153,7 +153,8 @@ describe 'OrderCycle controllers', ->
       expect(OrderCycle.removeDistributionOfVariant).toHaveBeenCalledWith('variant')
 
     it 'Submits the order cycle via OrderCycle create', ->
-      scope.submit()
+      eventMock = { preventDefault: -> }
+      scope.submit(eventMock)
       expect(OrderCycle.create).toHaveBeenCalled()
 
   describe 'AdminEditOrderCycleCtrl', ->
@@ -313,7 +314,8 @@ describe 'OrderCycle controllers', ->
       expect(OrderCycle.removeDistributionOfVariant).toHaveBeenCalledWith('variant')
 
     it 'Submits the order cycle via OrderCycle update', ->
-      scope.submit()
+      eventMock = { preventDefault: -> }
+      scope.submit(eventMock)
       expect(OrderCycle.update).toHaveBeenCalled()
 
 
@@ -526,7 +528,7 @@ describe 'OrderCycle services', ->
           incoming: false
           variants: {1: true, 2: false, 3: true}
           enterprise_fees: []
-    
+
       describe "removing incoming exchanges", ->
         beforeEach ->
           exchange.incoming = true
@@ -844,4 +846,3 @@ describe 'OrderCycle services', ->
           expect(order_cycle.outgoing_exchanges[0].enterprise_fees).toEqual [{id: 3}, {id: 4}]
           expect(order_cycle.incoming_exchanges[0].enterprise_fee_ids).toBeUndefined()
           expect(order_cycle.outgoing_exchanges[0].enterprise_fee_ids).toBeUndefined()
-