diff --git a/epdb/views.py b/epdb/views.py
index e8cc8276..3d569082 100644
--- a/epdb/views.py
+++ b/epdb/views.py
@@ -245,7 +245,9 @@ def register(request):
             context["message"] = "Invalid username/email/password"
             return render(request, "static/login.html", context)
 
-        if UnicodeUsernameValidator(username) is not None:
+        try:
+            UnicodeUsernameValidator()(username)
+        except ValidationError:
             context["message"] = (
                 "Enter a valid username. This value may contain only letters, "
                 "numbers, and @/./+/-/_ characters."
diff --git a/tests/frontend/frontend_base.py b/tests/frontend/frontend_base.py
index 61fe9dca..a9a03612 100644
--- a/tests/frontend/frontend_base.py
+++ b/tests/frontend/frontend_base.py
@@ -58,8 +58,8 @@ class EnviPyStaticLiveServerTestCase(StaticLiveServerTestCase):
     def login(self):
         """Sign in with the test user, 'user0'"""
         self.page.goto(self.live_server_url + "/login")
-        self.page.get_by_role("textbox", name="Username").click()
-        self.page.get_by_role("textbox", name="Username").fill(self.username)
+        self.page.get_by_role("textbox", name="Account").click()
+        self.page.get_by_role("textbox", name="Account").fill(self.username)
         self.page.get_by_role("textbox", name="Password").click()
         self.page.get_by_role("textbox", name="Password").fill(self.password)
 
diff --git a/tests/frontend/test_loginpage.py b/tests/frontend/test_loginpage.py
index fa80ba88..a49669a5 100644
--- a/tests/frontend/test_loginpage.py
+++ b/tests/frontend/test_loginpage.py
@@ -36,8 +36,8 @@ class TestLoginPage(EnviPyStaticLiveServerTestCase):
             u.is_active = True
             u.save()
 
-        page.get_by_role("textbox", name="Username").click()
-        page.get_by_role("textbox", name="Username").fill("newuser")
+        page.get_by_role("textbox", name="Account").click()
+        page.get_by_role("textbox", name="Account").fill("newuser")
         page.get_by_role("textbox", name="Password").click()
         page.get_by_role("textbox", name="Password").fill("NewUser_1")
         page.get_by_role("button", name="Sign In").click()