diff --git a/lib/mv_web/live/user_live/index.html.heex b/lib/mv_web/live/user_live/index.html.heex
index bb5a49d..ab13f90 100644
--- a/lib/mv_web/live/user_live/index.html.heex
+++ b/lib/mv_web/live/user_live/index.html.heex
@@ -15,6 +15,8 @@
     rows={@users}
     row_id={fn user -> "row-#{user.id}" end}
     row_click={fn user -> JS.navigate(~p"/users/#{user}") end}
+    sort_field={@sort_field}
+    sort_order={@sort_order}
   >
     <:col
       :let={user}
@@ -45,6 +47,7 @@
     </:col>
     <:col
       :let={user}
+      sort_field={:email}
       label={
         sort_button(%{
           field: :email,
@@ -74,7 +77,7 @@
       <% end %>
     </:col>
     <:col :let={user} label={gettext("OIDC")}>
-      <%= if user.oidc_id do %>
+      <%= if MvWeb.Helpers.UserHelpers.has_oidc?(user) do %>
         <span>{gettext("Linked")}</span>
       <% else %>
         <span class="text-base-content/70">—</span>
diff --git a/lib/mv_web/live/user_live/show.ex b/lib/mv_web/live/user_live/show.ex
index 2f52197..4d803cd 100644
--- a/lib/mv_web/live/user_live/show.ex
+++ b/lib/mv_web/live/user_live/show.ex
@@ -62,7 +62,9 @@ defmodule MvWeb.UserLive.Show do
             else: gettext("Not enabled")}
         </:item>
         <:item title={gettext("OIDC")}>
-          {if @user.oidc_id, do: gettext("Linked"), else: gettext("Not linked")}
+          {if MvWeb.Helpers.UserHelpers.has_oidc?(@user),
+            do: gettext("Linked"),
+            else: gettext("Not linked")}
         </:item>
         <:item title={gettext("Linked Member")}>
           <%= if @user.member do %>