diff --git a/server/routers/auth/pollDeviceWebAuth.ts b/server/routers/auth/pollDeviceWebAuth.ts
index ef749c30..9949ab42 100644
--- a/server/routers/auth/pollDeviceWebAuth.ts
+++ b/server/routers/auth/pollDeviceWebAuth.ts
@@ -125,16 +125,6 @@ export async function pollDeviceWebAuth(
             });
         }
 
-        // Check if IP matches
-        if (!requestIp || !deviceCode.ip || requestIp !== deviceCode.ip) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "IP address does not match"
-                )
-            );
-        }
-
         // Check if userId is set (should be set when verified)
         if (!deviceCode.userId) {
             logger.error("Device code is verified but userId is missing", { codeId: deviceCode.codeId });
diff --git a/src/components/ClientResourcesTable.tsx b/src/components/ClientResourcesTable.tsx
index 41afbc80..001cb132 100644
--- a/src/components/ClientResourcesTable.tsx
+++ b/src/components/ClientResourcesTable.tsx
@@ -226,7 +226,7 @@ export default function ClientResourcesTable({
                         displayText={resourceRow.alias}
                     />
                 ) : (
-                    <span>"-"</span>
+                    <span>-</span>
                 );
             }
         },
diff --git a/src/components/EditInternalResourceDialog.tsx b/src/components/EditInternalResourceDialog.tsx
index b69d1980..ecb0c925 100644
--- a/src/components/EditInternalResourceDialog.tsx
+++ b/src/components/EditInternalResourceDialog.tsx
@@ -348,17 +348,38 @@ export default function EditInternalResourceDialog({
         }
     };
 
-    // Set form values only once after initial load
     const hasInitialized = useRef(false);
+    const previousResourceId = useRef<number | null>(null);
 
     useEffect(() => {
-        if (!loadingRolesUsers && !hasInitialized.current) {
+        if (open) {
+            const resourceChanged = previousResourceId.current !== resource.id;
+            
+            if (resourceChanged) {
+                form.reset({
+                    name: resource.name,
+                    mode: resource.mode || "host",
+                    destination: resource.destination || "",
+                    alias: resource.alias ?? null,
+                    roles: [],
+                    users: [],
+                    clients: []
+                });
+                previousResourceId.current = resource.id;
+            }
+            
+            hasInitialized.current = false;
+        }
+    }, [open, resource.id, resource.name, resource.mode, resource.destination, resource.alias, form]);
+
+    useEffect(() => {
+        if (open && !loadingRolesUsers && !hasInitialized.current) {
             hasInitialized.current = true;
             form.setValue("roles", formRoles);
             form.setValue("users", formUsers);
             form.setValue("clients", existingClients);
         }
-    }, [loadingRolesUsers, formRoles, formUsers, existingClients, form]);
+    }, [open, loadingRolesUsers, formRoles, formUsers, existingClients, form]);
 
     return (
         <Credenza
@@ -378,8 +399,8 @@ export default function EditInternalResourceDialog({
                         users: [],
                         clients: []
                     });
-                    // Reset initialization flag so form can re-initialize with fresh data when reopened
-                    hasInitialized.current = false;
+                    // Reset previous resource ID to ensure clean state on next open
+                    previousResourceId.current = null;
                 }
                 setOpen(open);
             }}