diff --git a/config/initializers/gitlabhq/10_load_config.rb b/config/initializers/00_before_all.rb
similarity index 100%
rename from config/initializers/gitlabhq/10_load_config.rb
rename to config/initializers/00_before_all.rb
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 5b066edd4..78652bc2d 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -4,7 +4,7 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # 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 = "please-change-me-at-config-initializers-devise@example.com"
+  config.mailer_sender = EMAIL_OPTS["from"]
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"