diff --git a/test/teiserver/protocols/spring/spring_auth_test.exs b/test/teiserver/protocols/spring/spring_auth_test.exs
index 252890961e..d5edfa34dc 100644
--- a/test/teiserver/protocols/spring/spring_auth_test.exs
+++ b/test/teiserver/protocols/spring/spring_auth_test.exs
@@ -688,7 +688,7 @@ CLIENTS test_room #{user.name}\n"
     _recv_until(socket)
 
     # Mod/Bot only so timeout to start with
-    _send_raw(socket, "GETIP test_user_ip_user\n")
+    _send_raw(socket, "GETIP test_user_ip\n")
     reply = _recv_raw(socket)
     assert reply == :timeout
 
@@ -696,9 +696,9 @@ CLIENTS test_room #{user.name}\n"
     :timer.sleep(500)
     _recv_until(socket)
 
-    _send_raw(socket, "GETIP test_user_ip_user\n")
+    _send_raw(socket, "GETIP test_user_ip\n")
     reply = _recv_raw(socket)
-    assert reply == "test_user_ip_user is currently bound to 127.0.0.1\n"
+    assert reply == "test_user_ip is currently bound to 127.0.0.1\n"
   end
 
   test "GETUSERID", %{user: user, socket: socket} = context do
@@ -707,7 +707,7 @@ CLIENTS test_room #{user.name}\n"
     _recv_until(socket)
 
     # Mod/Bot only so timeout to start with
-    _send_raw(socket, "GETUSERID test_user_id_user\n")
+    _send_raw(socket, "GETUSERID test_user_id\n")
     reply = _recv_raw(socket)
     assert reply == :timeout
 
@@ -715,9 +715,9 @@ CLIENTS test_room #{user.name}\n"
     :timer.sleep(500)
     _recv_until(socket)
 
-    _send_raw(socket, "GETUSERID test_user_id_user\n")
+    _send_raw(socket, "GETUSERID test_user_id\n")
     reply = _recv_raw(socket)
-    assert reply == "The ID for test_user_id_user is 1993717506 0d04a635e200f308 #{ip_user.id}\n"
+    assert reply == "The ID for test_user_id is 1993717506 0d04a635e200f308 #{ip_user.id}\n"
   end
 
   # test "Unicode support - TCP", %{socket: socket1, user: user} = context do
diff --git a/test/teiserver_web/live/moderation/action_live/smurf_link_test.exs b/test/teiserver_web/live/moderation/action_live/smurf_link_test.exs
index 5f15d91c47..933e209d6e 100644
--- a/test/teiserver_web/live/moderation/action_live/smurf_link_test.exs
+++ b/test/teiserver_web/live/moderation/action_live/smurf_link_test.exs
@@ -27,7 +27,7 @@ defmodule TeiserverWeb.Live.Moderation.ActionLive.SmurfLinkTest do
       # Type into the box, result table should show up
       view
       |> element(~s{input.user-picker-search-input})
-      |> render_keyup(%{value: "_user-testname"})
+      |> render_keyup(%{value: "_user_testname"})
 
       # Even though our user is going to be a name match it should not
       # show up
@@ -51,7 +51,7 @@ defmodule TeiserverWeb.Live.Moderation.ActionLive.SmurfLinkTest do
         |> render()
 
       assert text_field_html ==
-               ~s(<input type="text" name="none" value="##{origin.id} - origin_user-testname" class="w-full input" placeholder="Click green button to search"/>)
+               ~s(<input type="text" name="none" value="##{origin.id} - origin_user_testname" class="w-full input" placeholder="Click green button to search"/>)
 
       hidden_field_html =
         view