diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index 83911456..f503629f 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -1,6 +1,4 @@
 class AdminMailer < ActionMailer::Base
-  default :from => "nztrain@gmail.com"
-
   def custom_email(admin,user,subject,msgbody)
     @user = user
     @msgbody = msgbody
diff --git a/app/views/user/admin_email.html.erb b/app/views/user/admin_email.html.erb
index 4a4cf38a..547d1bc5 100644
--- a/app/views/user/admin_email.html.erb
+++ b/app/views/user/admin_email.html.erb
@@ -13,7 +13,7 @@
   </div>
   <p>
     <%= current_user.name %><br />
-    Admin of nztrain.com
+    Admin of NZOI Training
   </p>
 
   <div class="actions">
diff --git a/config/application.rb b/config/application.rb
index 803fd399..3b2f5501 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,7 +2,7 @@
 require 'rubygems'
 require 'rails/all'
 
-if defined?(Bundler)  
+if defined?(Bundler)
   # Require the gems listed in Gemfile, including any gems
   # you've limited to :test, :development, or :production.
   Bundler.require(:default, Rails.env)
@@ -46,15 +46,14 @@ class Application < Rails::Application
     config.action_mailer.delivery_method = :smtp
     config.action_mailer.perform_deliveries = true
     config.action_mailer.raise_delivery_errors = true
-    config.action_mailer.default :charset => "utf-8"
 
     ActionMailer::Base.smtp_settings = {
       :address => "smtp.gmail.com",
       :port => 587,
       :authentication => :plain,
-      :domain => 'nztrain.com',
-      :user_name => 'nztrain@gmail.com', # username and password set with higher priority in settings table
-      :password => 'training site',
+      :domain => 'nzoi.org.nz',
+      #:user_name => ..., # set in config/initializers/mailer.rb
+      #:password => ...,  # set in config/initializers/mailer.rb
       :enable_starttls_auto => true
     }
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 05fc3f0d..22f41cfe 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -25,6 +25,8 @@
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  config.action_mailer.default_options = { from: "train@example.com" }
+
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 0b9c8d07..f2900a09 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,7 +10,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = "nztrain@gmail.com"
+  #config.mailer_sender = ...
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
diff --git a/config/initializers/mailer.rb b/config/initializers/mailer.rb
index 21fee7cc..071c9f3d 100644
--- a/config/initializers/mailer.rb
+++ b/config/initializers/mailer.rb
@@ -1,7 +1,17 @@
-# use db stored username and password for email if present
+# use db-stored email address and password for sending email
+
+def email_address_with_name(address, name)
+  # can switch to ActionMailer::Base.email_address_with_name() once we upgrade to Rails 6
+  Mail::Address.new.tap do |builder|
+    builder.address = address
+    builder.display_name = name.presence
+  end.to_s
+end
 
 if ActiveRecord::Base.connection.table_exists?(Setting.table_name)
-  ActionMailer::Base.smtp_settings[:user_name] = Setting.find_by_key("system/mailer/username").value if Setting.find_by_key("system/mailer/username")
-  ActionMailer::Base.smtp_settings[:password] = Setting.find_by_key("system/mailer/password").value if Setting.find_by_key("system/mailer/password")
+  email_setting = Setting.find_by_key("system/mailer/email")
+  ActionMailer::Base.smtp_settings[:user_name] = email_setting&.value
+  ActionMailer::Base.smtp_settings[:password] = Setting.find_by_key("system/mailer/password")&.value
+  ActionMailer::Base.default from: email_address_with_name(email_setting.value, "NZOI Training") if email_setting&.value.present?
 end
 
diff --git a/db/migrate/20120805061859_system_mailer_settings.rb b/db/migrate/20120805061859_system_mailer_settings.rb
deleted file mode 100644
index 71bb3bed..00000000
--- a/db/migrate/20120805061859_system_mailer_settings.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class SystemMailerSettings < ActiveRecord::Migration
-  def up
-    Setting.find_or_create_by!(key: "system/mailer/username", value: "nztrain@gmail.com")
-    Setting.find_or_create_by!(key: "system/mailer/password", value: "training site")
-  end
-
-  def down
-  end
-end
diff --git a/db/migrate/20250318053450_rename_setting_mailer_username_to_email.rb b/db/migrate/20250318053450_rename_setting_mailer_username_to_email.rb
new file mode 100644
index 00000000..7097256c
--- /dev/null
+++ b/db/migrate/20250318053450_rename_setting_mailer_username_to_email.rb
@@ -0,0 +1,11 @@
+class RenameSettingMailerUsernameToEmail < ActiveRecord::Migration
+  # this migration can be deleted after deploying
+
+  def up
+    execute "UPDATE settings SET key = 'system/mailer/email' WHERE key = 'system/mailer/username'"
+  end
+
+  def down
+    execute "UPDATE settings SET key = 'system/mailer/username' WHERE key = 'system/mailer/email'"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0c980263..43d4326b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20230225054132) do
+ActiveRecord::Schema.define(version: 20250318053450) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
diff --git a/db/seeds.rb b/db/seeds.rb
index a8524876..f8a05341 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -34,7 +34,7 @@
   superadmin.users.push(rootuser) unless superadmin.users.include?(rootuser);
 end
 
-["recaptcha/public_key","recaptcha/private_key"].each do |setting|
+["system/mailer/email","system/mailer/password","recaptcha/public_key","recaptcha/private_key"].each do |setting|
   Setting.find_or_create_by(key: setting)
 end
 
diff --git a/lib/development_mail_interceptor.rb b/lib/development_mail_interceptor.rb
index 838a87c2..f5bf728b 100644
--- a/lib/development_mail_interceptor.rb
+++ b/lib/development_mail_interceptor.rb
@@ -1,7 +1,7 @@
 class DevelopmentMailInterceptor
   def self.delivering_email(message)
     message.subject = "[Development] #{message.to} #{message.subject}"
-    message.to = "nztrain@gmail.com"
+    message.to = message.from
   end
 end