diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6b17e690..922a51dd 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -132,7 +132,7 @@ def require_user
   def require_no_user
     if current_user
       store_location
-      flash[:notice] = t :not_logged_in
+      flash[:notice] = t :already_signed_in
       redirect_to root_path
       false
     end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1699ebc2..04f768ce 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -344,6 +344,7 @@ en:
     please contact us.
   none: none
   not_logged_in: Not logged in
+  already_signed_in: You are already signed in.
   note_created_error_message: There was a problem creating this note
   notes: Notes
   notes_about_this: Optional notes for this %{class_name}
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 331d07e7..2fb9d40d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -323,6 +323,7 @@ es:
   no_user_with_that_email: Parece haber un problema. Si esto continua, por favor contacta con nosotros.
   none: Ninguna
   not_logged_in: No tienes ninguna sesión abierta
+  already_signed_in: Ya tienes una sesión abierta.
   note_created_error_message: Ocurrió un problema al crear este comentario
   notes: Comentarios
   notes_about_this: Comentarios adicionales para este %{class_name}
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 68ecc059..c6e88639 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -339,6 +339,7 @@ pt:
     entre em contato conosco.
   none: nenhum
   not_logged_in: Não logado
+  already_signed_in: Você já está conectado.
   note_created_error_message: Houve um problema ao criar esta nota
   notes: Notas
   notes_about_this: Notas opcionais para este %{class_name}
diff --git a/test/functional/password_resets_controller_test.rb b/test/functional/password_resets_controller_test.rb
index 5ce1c140..b394665a 100644
--- a/test/functional/password_resets_controller_test.rb
+++ b/test/functional/password_resets_controller_test.rb
@@ -8,6 +8,15 @@ class PasswordResetsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test 'redirects signed in users away with the right message' do
+    @controller.session['user'] = users(:founder)
+
+    get :new
+
+    assert_redirected_to root_path
+    assert_equal I18n.t(:already_signed_in), flash[:notice]
+  end
+
   test 'create sends reset instructions for a valid email' do
     user = users(:founder)
     emails_before = ActionMailer::Base.deliveries.size