diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index 8ab8179a..e1cfff53 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -827,22 +827,23 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 		}
 	}
 	
-	public func sendShutdown(fromUser: UserEntity, toUser: UserEntity) -> Bool {
+	public func sendShutdown(fromUser: UserEntity, toUser: UserEntity, adminIndex: Int32) -> Bool {
 		
 		var adminPacket = AdminMessage()
-		adminPacket.shutdownSeconds = 10
+		adminPacket.shutdownSeconds = 5
 		var meshPacket: MeshPacket = MeshPacket()
 		meshPacket.to = UInt32(toUser.num)
 		meshPacket.from	= UInt32(fromUser.num)
 		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
 		meshPacket.priority =  MeshPacket.Priority.reliable
 		meshPacket.wantAck = true
+		meshPacket.channel = UInt32(adminIndex)
 		var dataMessage = DataMessage()
 		dataMessage.payload = try! adminPacket.serializedData()
 		dataMessage.portnum = PortNum.adminApp
 		meshPacket.decoded = dataMessage
 		
-		let messageDescription = "Sent Shutdown Admin Message to: \(toUser.longName ?? NSLocalizedString("unknown", comment: ""))"
+		let messageDescription = "🚀 Sent Shutdown Admin Message to: \(toUser.longName ?? NSLocalizedString("unknown", comment: "")) from: \(fromUser.longName ?? NSLocalizedString("unknown", comment: ""))"
 		if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) {
 			return true
 		}
@@ -850,10 +851,10 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 		return false
 	}
 	
-	public func sendReboot(fromUser: UserEntity, toUser: UserEntity) -> Bool {
+	public func sendReboot(fromUser: UserEntity, toUser: UserEntity, adminIndex: Int32) -> Bool {
 		
 		var adminPacket = AdminMessage()
-		adminPacket.rebootSeconds = 10
+		adminPacket.rebootSeconds = 5
 		
 		var meshPacket: MeshPacket = MeshPacket()
 		meshPacket.to = UInt32(toUser.num)
@@ -861,13 +862,13 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
 		meshPacket.priority =  MeshPacket.Priority.reliable
 		meshPacket.wantAck = true
-		
+		meshPacket.channel = UInt32(adminIndex)
 		var dataMessage = DataMessage()
 		dataMessage.payload = try! adminPacket.serializedData()
 		dataMessage.portnum = PortNum.adminApp
 		meshPacket.decoded = dataMessage
 		
-		let messageDescription = "Sent Reboot Admin Message to: \(toUser.longName ?? NSLocalizedString("unknown", comment: ""))"
+		let messageDescription = "🚀 Sent Reboot Admin Message to: \(toUser.longName ?? NSLocalizedString("unknown", comment: "")) from: \(fromUser.longName ?? NSLocalizedString("unknown", comment: ""))"
 		if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) {
 			return true
 		}
@@ -891,7 +892,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 		dataMessage.portnum = PortNum.adminApp
 		meshPacket.decoded = dataMessage
 
-		let messageDescription = "Sent Factory Reset Admin Message to: \(toUser.longName ?? NSLocalizedString("unknown", comment: ""))"
+		let messageDescription = "🚀 Sent Factory Reset Admin Message to: \(toUser.longName ?? NSLocalizedString("unknown", comment: "")) from: \(fromUser.longName ?? NSLocalizedString("unknown", comment: ""))"
 		if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) {
 			return true
 		}
@@ -909,13 +910,12 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
 		meshPacket.priority =  MeshPacket.Priority.reliable
 		meshPacket.wantAck = true
-		
 		var dataMessage = DataMessage()
 		dataMessage.payload = try! adminPacket.serializedData()
 		dataMessage.portnum = PortNum.adminApp
 		
 		meshPacket.decoded = dataMessage
-		let messageDescription = "Sent NodeDB Reset Admin Message to: \(toUser.longName ?? NSLocalizedString("unknown", comment: ""))"
+		let messageDescription = "🚀 Sent NodeDB Reset Admin Message to: \(toUser.longName ?? NSLocalizedString("unknown", comment: "")) from: \(fromUser.longName ?? NSLocalizedString("unknown", comment: ""))"
 		if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) {
 			return true
 		}
diff --git a/Meshtastic/Views/Nodes/NodeDetail.swift b/Meshtastic/Views/Nodes/NodeDetail.swift
index 40abf70f..7b83089e 100644
--- a/Meshtastic/Views/Nodes/NodeDetail.swift
+++ b/Meshtastic/Views/Nodes/NodeDetail.swift
@@ -379,7 +379,7 @@ struct NodeDetail: View {
 										isPresented: $showingShutdownConfirm
 									) {
 										Button("Shutdown Node?", role: .destructive) {
-											if !bleManager.sendShutdown(fromUser: connectedNode.user!, toUser: node.user!) {
+											if !bleManager.sendShutdown(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo!.adminIndex) {
 												print("Shutdown Failed")
 											}
 										}
@@ -399,7 +399,7 @@ struct NodeDetail: View {
 													isPresented: $showingRebootConfirm
 								) {
 									Button("reboot.node", role: .destructive) {
-										if !bleManager.sendReboot(fromUser: connectedNode.user!, toUser: node.user!) {
+										if !bleManager.sendReboot(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo!.adminIndex) {
 											print("Reboot Failed")
 										}
 									}
diff --git a/Meshtastic/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift
index 8023fb4f..8c3d5a06 100644
--- a/Meshtastic/Views/Settings/Config/DeviceConfig.swift
+++ b/Meshtastic/Views/Settings/Config/DeviceConfig.swift
@@ -87,56 +87,59 @@ struct DeviceConfig: View {
 			}
 			.disabled(self.bleManager.connectedPeripheral == nil || node?.deviceConfig == nil)
 			
-			HStack {
-				
-				Button("Reset NodeDB", role: .destructive) {
-					isPresentingNodeDBResetConfirm = true
-				}
-				.disabled(node?.user == nil)
-				.buttonStyle(.bordered)
-				.buttonBorderShape(.capsule)
-				.controlSize(.large)
-				.padding()
-				.confirmationDialog(
-					"are.you.sure",
-					isPresented: $isPresentingNodeDBResetConfirm,
-					titleVisibility: .visible
-				) {
-					Button("Erase all device and app data?", role: .destructive) {
-						if bleManager.sendNodeDBReset(fromUser: node!.user!, toUser: node!.user!) {
-							bleManager.disconnectPeripheral()
-							clearCoreDataDatabase(context: context)
-						} else {
-							print("NodeDB Reset Failed")
+			// Only show these buttons for the BLE connected node
+			if bleManager.connectedPeripheral != nil && node?.num ?? -1  == bleManager.connectedPeripheral.num {
+				HStack {
+					
+					Button("Reset NodeDB", role: .destructive) {
+						isPresentingNodeDBResetConfirm = true
+					}
+					.disabled(node?.user == nil)
+					.buttonStyle(.bordered)
+					.buttonBorderShape(.capsule)
+					.controlSize(.large)
+					.padding()
+					.confirmationDialog(
+						"are.you.sure",
+						isPresented: $isPresentingNodeDBResetConfirm,
+						titleVisibility: .visible
+					) {
+						Button("Erase all device and app data?", role: .destructive) {
+							
+							if bleManager.sendNodeDBReset(fromUser: node!.user!, toUser: node!.user!) {
+								bleManager.disconnectPeripheral()
+								clearCoreDataDatabase(context: context)
+							} else {
+								print("NodeDB Reset Failed")
+							}
 						}
 					}
-				}
-				Button("Factory Reset", role: .destructive) {
-					isPresentingFactoryResetConfirm = true
-				}
-				.disabled(node?.user == nil)
-				.buttonStyle(.bordered)
-				.buttonBorderShape(.capsule)
-				.controlSize(.large)
-				.padding()
-				.confirmationDialog(
-					"All device and app data will be deleted. You will also need to forget your devices under Settings > Bluetooth.",
-					isPresented: $isPresentingFactoryResetConfirm,
-					titleVisibility: .visible
-				) {
-					Button("Factory reset your device and app? ", role: .destructive) {
-						
-						if bleManager.sendFactoryReset(fromUser: node!.user!, toUser: node!.user!) {
-							bleManager.disconnectPeripheral()
-							clearCoreDataDatabase(context: context)
-						} else {
-							print("Factory Reset Failed")
+					Button("Factory Reset", role: .destructive) {
+						isPresentingFactoryResetConfirm = true
+					}
+					.disabled(node?.user == nil)
+					.buttonStyle(.bordered)
+					.buttonBorderShape(.capsule)
+					.controlSize(.large)
+					.padding()
+					.confirmationDialog(
+						"All device and app data will be deleted. You will also need to forget your devices under Settings > Bluetooth.",
+						isPresented: $isPresentingFactoryResetConfirm,
+						titleVisibility: .visible
+					) {
+						Button("Factory reset your device and app? ", role: .destructive) {
 							
+							if bleManager.sendFactoryReset(fromUser: node!.user!, toUser: node!.user!) {
+								bleManager.disconnectPeripheral()
+								clearCoreDataDatabase(context: context)
+							} else {
+								print("Factory Reset Failed")
+								
+							}
 						}
 					}
 				}
 			}
-			
 			HStack {
 				
 				Button {