diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift
index d4bfdbf1..cdbf291a 100644
--- a/Meshtastic/Views/Messages/UserList.swift
+++ b/Meshtastic/Views/Messages/UserList.swift
@@ -225,7 +225,7 @@ struct UserList: View {
 			.onChange(of: maxDistance) { _ in
 				searchUserList()
 			}
-			.onAppear {
+			.onFirstAppear {
 				searchUserList()
 			}
 			.safeAreaInset(edge: .bottom, alignment: .trailing) {
diff --git a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
index 0d9897c7..e8eeeecd 100644
--- a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
+++ b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
@@ -45,7 +45,7 @@ struct NodeDetail: View {
 				}
 				Section("Node") {
 					if let user = node.user {
-						if user.keyMatch {
+						if !user.keyMatch {
 							Label {
 								VStack(alignment: .leading) {
 									Text("Public Key Mismatch")
diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift
index 310abc9b..5248b6bf 100644
--- a/Meshtastic/Views/Nodes/NodeList.swift
+++ b/Meshtastic/Views/Nodes/NodeList.swift
@@ -337,7 +337,7 @@ struct NodeList: View {
 				self.selectedNode = nil
 			}
 		}
-		.onAppear {
+		.onFirstAppear {
 			Task {
 				await searchNodeList()
 			}