1 files changed, 4 insertions, 13 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 232c0ffa1..5bce8ecc7 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -577,17 +577,11 @@ class PublicBody < ActiveRecord::Base
         return self.request_email_domain
     end
 
-    # Returns nil if configuration variable not set
-    def override_request_email
-        e = AlaveteliConfiguration::override_all_public_body_request_emails
-        e if e != ""
-    end
-
     def request_email
-        if override_request_email
-            override_request_email
-        else
+        if AlaveteliConfiguration::override_all_public_body_request_emails.blank? || read_attribute(:request_email).blank?
             read_attribute(:request_email)
+        else
+            AlaveteliConfiguration::override_all_public_body_request_emails
         end
     end
 
@@ -774,10 +768,7 @@ class PublicBody < ActiveRecord::Base
     end
 
     def empty_translation_in_params?(attributes)
-        attrs_with_values = attributes.select do |key, value|
-            value != '' and key.to_s != 'locale'
-        end
-        attrs_with_values.empty?
+        attributes.select { |k, v| !v.blank? && k.to_s != 'locale' }.empty?
     end
 
     def request_email_if_requestable