diff --git a/config/initializers/user_class_extensions.rb b/config/initializers/user_class_extensions.rb
new file mode 100644
index 0000000000..cd9ff60a0c
--- /dev/null
+++ b/config/initializers/user_class_extensions.rb
@@ -0,0 +1,11 @@
+Spree::Core::Engine.config.to_prepare do
+  if Spree.user_class
+    Spree.user_class.class_eval do
+
+      # Override of spree method to ignore orders associated with account_invoices
+      def last_incomplete_spree_order
+        spree_orders.incomplete.where("id NOT IN (?)", account_invoices.map(&:order_id)).order('created_at DESC').first
+      end
+    end
+  end
+end