diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index ba7e29dba..cdec22a31 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -2,8 +2,10 @@
   .floating
     %h3
       =t('.forgot_password')
+    - unless devise_error_messages!.empty?
+      %i=  t('.no_account')
+
     = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
-      = devise_error_messages!
       %p
         = f.label :email
         = f.text_field :email
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index a86b8dee1..958e23d3d 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -34,6 +34,7 @@ en:
         change_password: "Change my password"
       new:
         forgot_password: "Forgot your password?"
+        no_account: 'No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible'
         send_password_instructions: "Send me reset password instructions"
     confirmations:
       send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'