diff --git a/lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb b/lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb
index 14708adcb..d02a59215 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced/database_tasks.rb
@@ -13,11 +13,14 @@ def initialize(config)
         end
 
         def create
+          system_username = ENV["ORACLE_SYSTEM_USER"] || "SYSTEM"
+          $stdout.puts "System user: '#{system_username}' (set ORACLE_SYSTEM_USER to override)" unless ENV["ORACLE_SYSTEM_USER"]
+
           system_password = ENV.fetch("ORACLE_SYSTEM_PASSWORD") {
-            print "Please provide the SYSTEM password for your Oracle installation (set ORACLE_SYSTEM_PASSWORD to avoid this prompt)\n>"
+            print "Please provide the '#{system_username}' password for your Oracle installation (set ORACLE_SYSTEM_PASSWORD to avoid this prompt)\n>"
             $stdin.gets.strip
           }
-          establish_connection(@config.merge(username: "SYSTEM", password: system_password))
+          establish_connection(@config.merge(username: system_username, password: system_password))
           begin
             connection.execute "CREATE USER #{@config[:username]} IDENTIFIED BY #{@config[:password]}"
           rescue => e