diff --git a/app/main/views/register.py b/app/main/views/register.py
index 4892832ea..0c8f1ccbf 100644
--- a/app/main/views/register.py
+++ b/app/main/views/register.py
@@ -28,6 +28,6 @@ def process_register():
             users_dao.insert_user(user)
             return redirect('/two-factor')
         except Exception as e:
-            return jsonify(database_error='encountered database error'), 400
+            return jsonify(database_error=e.message), 400
     else:
         return jsonify(form.errors), 400
diff --git a/tests/conftest.py b/tests/conftest.py
index 338e4d63b..8712733e3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,4 +1,5 @@
 import pytest
+from _pytest.monkeypatch import monkeypatch
 from sqlalchemy.schema import MetaData, DropConstraint
 
 from app import create_app, db