diff --git a/app/main/views/forgot_password.py b/app/main/views/forgot_password.py
index ba4c3d67d..800474200 100644
--- a/app/main/views/forgot_password.py
+++ b/app/main/views/forgot_password.py
@@ -15,6 +15,7 @@ def forgot_password():
             users_dao.request_password_reset(user)
             send_change_password_email(form.email_address.data)
             return render_template('views/password-reset-sent.html')
-        flash('There was an error processing your request')
+        else:
+            return render_template('views/password-reset-sent.html')
 
     return render_template('views/forgot-password.html', form=form)
diff --git a/tests/app/main/views/test_forgot_password.py b/tests/app/main/views/test_forgot_password.py
index 65b9f55ee..7789b4197 100644
--- a/tests/app/main/views/test_forgot_password.py
+++ b/tests/app/main/views/test_forgot_password.py
@@ -9,11 +9,13 @@ def test_should_render_forgot_password(app_):
                in response.get_data(as_text=True)
 
 
-def test_should_redirect_to_password_reset_sent_and_state_updated(app_,
-                                                                  api_user_active,
-                                                                  mock_get_user_by_email,
-                                                                  mock_update_user,
-                                                                  mock_send_email):
+def test_should_redirect_to_password_reset_sent_and_state_updated(
+    app_,
+    api_user_active,
+    mock_get_user_by_email,
+    mock_update_user,
+    mock_send_email
+):
     with app_.test_request_context():
         response = app_.test_client().post(
             url_for('.forgot_password'),
@@ -22,3 +24,23 @@ def test_should_redirect_to_password_reset_sent_and_state_updated(app_,
         assert (
             'You have been sent an email containing a link'
             ' to reset your password.') in response.get_data(as_text=True)
+        assert mock_send_email.call_count == 1
+
+
+def test_should_redirect_to_password_reset_sent_for_non_existant_email_address(
+    app_,
+    api_user_active,
+    mock_dont_get_user_by_email,
+    mock_update_user,
+    mock_send_email
+):
+    with app_.test_request_context():
+        response = app_.test_client().post(
+            url_for('.forgot_password'),
+            data={'email_address': 'nope@example.gov.uk'})
+        assert response.status_code == 200
+        assert (
+            'You have been sent an email containing a link'
+            ' to reset your password.') in response.get_data(as_text=True)
+        mock_dont_get_user_by_email.assert_called_once_with('nope@example.gov.uk')
+        assert not mock_send_email.called
diff --git a/tests/conftest.py b/tests/conftest.py
index 3ede76035..d53b1e72e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -41,7 +41,7 @@ def mock_send_sms(request, mocker):
 
 @pytest.fixture(scope='function')
 def mock_send_email(request, mocker):
-    return mocker.patch("app.notifications_api_client.send_email")
+    return mocker.patch("app.notifications_api_client.send_email", autospec=True)
 
 
 @pytest.fixture(scope='function')
@@ -287,6 +287,18 @@ def mock_get_user_by_email(mocker, api_user_active):
     return mocker.patch('app.user_api_client.get_user_by_email', side_effect=_get_user)
 
 
+@pytest.fixture(scope='function')
+def mock_dont_get_user_by_email(mocker):
+
+    def _get_user(email_address):
+        return None
+    return mocker.patch(
+        'app.user_api_client.get_user_by_email',
+        side_effect=_get_user,
+        autospec=True
+    )
+
+
 @pytest.fixture(scope='function')
 def mock_get_user_by_email_request_password_reset(mocker, api_user_request_password_reset):
     return mocker.patch(