diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
index 83fac71b..43f27393 100644
--- a/Meshtastic.xcodeproj/project.pbxproj
+++ b/Meshtastic.xcodeproj/project.pbxproj
@@ -719,8 +719,8 @@
 				DD41582528582E9B009B0E59 /* DeviceConfig.swift */,
 				DD8EBF42285058FA00426DCA /* DisplayConfig.swift */,
 				DD2553562855B02500E55709 /* LoRaConfig.swift */,
-				DD2553582855B52700E55709 /* PositionConfig.swift */,
 				DD8ED9C42898D51F00B3B0AB /* NetworkConfig.swift */,
+				DD2553582855B52700E55709 /* PositionConfig.swift */,
 				D93068DA2B81C85E0066FBC8 /* PowerConfig.swift */,
 				DD1BD0F22C63C65E008C0C70 /* SecurityConfig.swift */,
 				DD61937B2863877A00E59241 /* Module */,
diff --git a/Meshtastic/Views/Settings/Config/NetworkConfig.swift b/Meshtastic/Views/Settings/Config/NetworkConfig.swift
index 0554c766..dd767b6c 100644
--- a/Meshtastic/Views/Settings/Config/NetworkConfig.swift
+++ b/Meshtastic/Views/Settings/Config/NetworkConfig.swift
@@ -128,6 +128,25 @@ struct NetworkConfig: View {
 				}
 			}
 		}
+		.onFirstAppear {
+			// Need to request a NetworkConfig from the remote node before allowing changes
+			if let connectedPeripheral = bleManager.connectedPeripheral, let node {
+				Logger.mesh.info("empty network config")
+				let connectedNode = getNodeInfo(id: connectedPeripheral.num, context: context)
+				if let connectedNode {
+					if UserDefaults.enableAdministration {
+						/// 2.5 Administration with session passkey
+						let expiration = node.sessionExpiration ?? Date()
+						if expiration < Date() || node.networkConfig == nil {
+							_ = bleManager.requestNetworkConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
+						}
+					} else {
+						/// Legacy Administration
+						_ = bleManager.requestNetworkConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
+					}
+				}
+			}
+		}
 		.onChange(of: wifiEnabled) {
 			if $0 != node?.networkConfig?.wifiEnabled { hasChanges = true }
 		}
diff --git a/Meshtastic/Views/Settings/Config/PositionConfig.swift b/Meshtastic/Views/Settings/Config/PositionConfig.swift
index 0f71b379..392486da 100644
--- a/Meshtastic/Views/Settings/Config/PositionConfig.swift
+++ b/Meshtastic/Views/Settings/Config/PositionConfig.swift
@@ -376,18 +376,23 @@ struct PositionConfig: View {
 				)
 			}
 		)
-		.onAppear {
+		.onFirstAppear {
 			supportedVersion = bleManager.connectedVersion == "0.0.0" ||  self.minimumVersion.compare(bleManager.connectedVersion, options: .numeric) == .orderedAscending || minimumVersion.compare(bleManager.connectedVersion, options: .numeric) == .orderedSame
-			// Need to request a PositionConfig from the remote node before allowing changes
-			if let connectedPeripheral = bleManager.connectedPeripheral, node?.positionConfig == nil {
+			// Need to request a NetworkConfig from the remote node before allowing changes
+			if let connectedPeripheral = bleManager.connectedPeripheral, let node {
 				Logger.mesh.info("empty position config")
 				let connectedNode = getNodeInfo(id: connectedPeripheral.num, context: context)
-				if let node, let connectedNode {
-					_ = bleManager.requestPositionConfig(
-						fromUser: connectedNode.user!,
-						toUser: node.user!,
-						adminIndex: connectedNode.myInfo?.adminIndex ?? 0
-					)
+				if let connectedNode {
+					if UserDefaults.enableAdministration {
+						/// 2.5 Administration with session passkey
+						let expiration = node.sessionExpiration ?? Date()
+						if expiration < Date() || node.positionConfig == nil {
+							_ = bleManager.requestPositionConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
+						}
+					} else {
+						/// Legacy Administration
+						_ = bleManager.requestPositionConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
+					}
 				}
 			}
 		}
diff --git a/Meshtastic/Views/Settings/Config/PowerConfig.swift b/Meshtastic/Views/Settings/Config/PowerConfig.swift
index 42b6a534..cf213f8e 100644
--- a/Meshtastic/Views/Settings/Config/PowerConfig.swift
+++ b/Meshtastic/Views/Settings/Config/PowerConfig.swift
@@ -1,5 +1,6 @@
 import SwiftUI
 import MeshtasticProtobufs
+import OSLog
 
 struct PowerConfig: View {
 	@Environment(\.managedObjectContext) private var context
@@ -118,6 +119,17 @@ struct PowerConfig: View {
 			}
 		}
 		.onAppear {
+			
+			// Need to request a Power config from the remote node before allowing changes
+			if bleManager.connectedPeripheral != nil && node?.powerConfig == nil {
+				let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? 0, context: context)
+				if node != nil && connectedNode != nil {
+					_ = bleManager.requestPowerConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)
+				}
+			}
+		}
+		
+		.onFirstAppear {
 			Api().loadDeviceHardwareData { (hw) in
 				for device in hw {
 					let currentHardware = node?.user?.hwModel ?? "UNSET"
@@ -127,11 +139,21 @@ struct PowerConfig: View {
 					}
 				}
 			}
-			// Need to request a Power config from the remote node before allowing changes
-			if bleManager.connectedPeripheral != nil && node?.powerConfig == nil {
-				let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? 0, context: context)
-				if node != nil && connectedNode != nil {
-					_ = bleManager.requestPowerConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)
+			// Need to request a NetworkConfig from the remote node before allowing changes
+			if let connectedPeripheral = bleManager.connectedPeripheral, let node {
+				Logger.mesh.info("empty power config")
+				let connectedNode = getNodeInfo(id: connectedPeripheral.num, context: context)
+				if let connectedNode {
+					if UserDefaults.enableAdministration {
+						/// 2.5 Administration with session passkey
+						let expiration = node.sessionExpiration ?? Date()
+						if expiration < Date() || node.positionConfig == nil {
+							_ = bleManager.requestPositionConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
+						}
+					} else {
+						/// Legacy Administration
+						_ = bleManager.requestPowerConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
+					}
 				}
 			}
 		}