diff --git a/app/models/setting.rb b/app/models/setting.rb
index b7a2a9b32..baef55815 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -242,9 +242,10 @@ private
   def self.find_or_default(name)
     name = name.to_s
     raise "There's no setting named #{name}" unless @@available_settings.has_key?(name)
-    setting = find_by_name(name)
+    setting = where(:name => name).first
     unless setting
-      setting = new(:name => name)
+      setting = new
+      setting.name = name
       setting.value = @@available_settings[name]['default']
     end
     setting