diff --git a/lib/backup_restore.rb b/lib/backup_restore.rb
index 60aae544c..14551a86a 100644
--- a/lib/backup_restore.rb
+++ b/lib/backup_restore.rb
@@ -104,15 +104,15 @@ module BackupRestore
   DatabaseConfiguration = Struct.new(:host, :username, :password, :database)
 
   def self.database_configuration
-    if Rails.env.production?
-      db = ActiveRecord::Base.connection_pool.spec.config
-      db_conf = DatabaseConfiguration.new(db["host"], db["username"], db["password"], db["database"])
-    else
-      db = Rails.configuration.database_configuration[Rails.env]
-      db_conf = DatabaseConfiguration.new(db["host"], db["username"], db["password"], db["database"])
-    end
-    db_conf.username ||= ENV["USER"] || "postgres"
-    db_conf
+    config = Rails.env.production? ? ActiveRecord::Base.connection_pool.spec.config : Rails.configuration.database_configuration[Rails.env]
+    config = config.with_indifferent_access
+
+    DatabaseConfiguration.new(
+      config["host"],
+      config["username"] || ENV["USER"] || "postgres",
+      config["password"],
+      config["database"]
+    )
   end
 
   private