diff --git a/lib/alchemy/solidus/engine.rb b/lib/alchemy/solidus/engine.rb
index 66cc3d5..332fef9 100644
--- a/lib/alchemy/solidus/engine.rb
+++ b/lib/alchemy/solidus/engine.rb
@@ -3,6 +3,7 @@
 require 'alchemy_cms'
 require 'solidus_core'
 require 'solidus_backend'
+require 'solidus_support'
 
 module Alchemy
   module Solidus
@@ -28,6 +29,10 @@ class Engine < ::Rails::Engine
           require 'alchemy/solidus/alchemy_user_extension'
           Alchemy::User.include Alchemy::Solidus::AlchemyUserExtension
         end
+
+        if SolidusSupport.solidus_gem_version < Gem::Version.new('2.5')
+          require 'alchemy/solidus/spree_custom_user_generator_fix'
+        end
       end
     end
   end
diff --git a/lib/alchemy/solidus/spree_custom_user_generator_fix.rb b/lib/alchemy/solidus/spree_custom_user_generator_fix.rb
new file mode 100644
index 0000000..fce2d95
--- /dev/null
+++ b/lib/alchemy/solidus/spree_custom_user_generator_fix.rb
@@ -0,0 +1,9 @@
+require 'active_record/migration'
+require 'generators/spree/custom_user/custom_user_generator'
+
+Spree::CustomUserGenerator.class_eval do
+  def self.next_migration_number(dirname)
+    next_migration_number = current_migration_number(dirname) + 1
+    ActiveRecord::Migration.next_migration_number(next_migration_number)
+  end
+end