diff --git a/core/app/controllers/checkout_controller.rb b/core/app/controllers/checkout_controller.rb
index c6c5be53e41..c8c819eb6e0 100644
--- a/core/app/controllers/checkout_controller.rb
+++ b/core/app/controllers/checkout_controller.rb
@@ -11,8 +11,7 @@ def update
       if @order.update_attributes(object_params)
         if @order.next
           state_callback(:after)
-          @order.next if @order.state == "adjustments"
-          if @order.state == "complete"
+          if @order.state == "complete" or @order.completed?
             flash[:notice] = I18n.t(:order_processed_successfully)
             redirect_to completion_route and return
           else