diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
index a095a39ed0..98f6400ea7 100644
--- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
+++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx
@@ -112,7 +112,7 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
   onUnlinkExternalAuth,
   onValidateExternalAuth,
 }) => {
-  const name = app.id || app.type;
+  const name = app.display_name || app.id || app.type;
   const authURL = "/external-auth/" + app.id;
 
   const {
@@ -127,10 +127,10 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
     : link?.authenticated ?? false;
 
   return (
-    <TableRow key={name}>
+    <TableRow key={app.id}>
       <TableCell>
         <AvatarData
-          title={app.display_name || app.id}
+          title={name}
           avatar={
             app.display_icon && (
               <Avatar src={app.display_icon} variant="square" fitImage />