diff --git a/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift b/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
index c7a03e33..7c7a3e27 100644
--- a/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
@@ -58,7 +58,7 @@ extension NodeInfoEntity {
 		}
 		return false
 	}
-	
+
 	var canRemoteAdmin: Bool {
 		if !(securityConfig?.adminKey?.isEmpty ?? true) {
 			return true
diff --git a/Meshtastic/Views/Settings/Config/NetworkConfig.swift b/Meshtastic/Views/Settings/Config/NetworkConfig.swift
index 51981606..0554c766 100644
--- a/Meshtastic/Views/Settings/Config/NetworkConfig.swift
+++ b/Meshtastic/Views/Settings/Config/NetworkConfig.swift
@@ -133,7 +133,6 @@ struct NetworkConfig: View {
 		}
 		.onChange(of: wifiSsid) { newSSID in
 			if newSSID != node?.networkConfig?.wifiSsid { hasChanges = true }
-			
 		}
 		.onChange(of: wifiPsk) { newPsk in
 			if newPsk != node?.networkConfig?.wifiPsk { hasChanges = true }
diff --git a/Meshtastic/Views/Settings/Config/SecurityConfig.swift b/Meshtastic/Views/Settings/Config/SecurityConfig.swift
index 81672a15..6e4c1168 100644
--- a/Meshtastic/Views/Settings/Config/SecurityConfig.swift
+++ b/Meshtastic/Views/Settings/Config/SecurityConfig.swift
@@ -132,8 +132,8 @@ struct SecurityConfig: View {
 			}
 
 			var config = Config.SecurityConfig()
-			//config.publicKey = publicKey
-			//config.privateKey = privateKey
+			config.publicKey = Data(base64Encoded: publicKey) ?? Data()
+			config.privateKey = Data(base64Encoded: privateKey) ?? Data()
 			config.adminKey = Data(base64Encoded: adminKey) ?? Data()
 			config.isManaged = isManaged
 			config.serialEnabled = serialEnabled