diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index f5b0795e..e93afa03 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -18,7 +18,7 @@
   * Sign up now check if the user is active or not and redirect him accordingly setting the inactive_signed_up message
   * Use ActiveModel#to_key instead of #id
   * sign_out_all_scopes now destroys the whole session
-  * Added insensitive_case_keys that automatically downcases the given keys. By default downcases only e-mail.
+  * Added insensitive_case_keys that automatically downcases the given keys, by default downcases only e-mail (by github.com/adahl)
 
 * default behavior changes
   * sign_out_all_scopes defaults to true as security measure
@@ -32,6 +32,7 @@
   * FailureApp now properly handles nil request.format
   * Fix a bug causing FailureApp to return with HTTP Auth Headers for IE7
   * Ensure namespaces has proper scoped views
+  * Ensure Devise does not set empty flash messages (by github.com/sxross)
 
 == 1.1.3
 
diff --git a/lib/devise/controllers/internal_helpers.rb b/lib/devise/controllers/internal_helpers.rb
index b776679c..5a1d99e2 100644
--- a/lib/devise/controllers/internal_helpers.rb
+++ b/lib/devise/controllers/internal_helpers.rb
@@ -103,7 +103,7 @@ module Devise
         options[:default] = Array(options[:default]).unshift(kind.to_sym)
         options[:resource_name] = resource_name
         message = I18n.t("#{resource_name}.#{kind}", options)
-        flash[key] = message.blank? ? nil : message
+        flash[key] = message if message.present?
       end
 
       def clean_up_passwords(object) #:nodoc: