diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index a6a78c44..08a77c6c 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -1048,6 +1048,35 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 		return 0
 	}
 	
+	public func saveBluetoothConfig(config: Config.BluetoothConfig, fromUser: UserEntity, toUser: UserEntity) -> Int64 {
+		
+		var adminPacket = AdminMessage()
+		adminPacket.setConfig.bluetooth = config
+		
+		var meshPacket: MeshPacket = MeshPacket()
+		meshPacket.to = UInt32(connectedPeripheral.num)
+		meshPacket.from	= 0 //UInt32(connectedPeripheral.num)
+		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
+		meshPacket.priority =  MeshPacket.Priority.reliable
+		meshPacket.wantAck = true
+		meshPacket.hopLimit = 0
+		
+		var dataMessage = DataMessage()
+		dataMessage.payload = try! adminPacket.serializedData()
+		dataMessage.portnum = PortNum.adminApp
+		
+		meshPacket.decoded = dataMessage
+		
+		let messageDescription = "Saved Bluetooth Config for \(toUser.longName ?? "Unknown")"
+		
+		if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) {
+			
+			return Int64(meshPacket.id)
+		}
+		
+		return 0
+	}
+	
 	public func saveDeviceConfig(config: Config.DeviceConfig, fromUser: UserEntity, toUser: UserEntity) -> Int64 {
 		
 		var adminPacket = AdminMessage()
diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index 1f8fb415..79419d51 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -131,7 +131,7 @@ func localConfig (config: Config, meshlogging: Bool, context:NSManagedObjectCont
 
 						newBluetoothConfig.enabled = config.bluetooth.enabled
 						newBluetoothConfig.mode = Int32(config.bluetooth.mode.rawValue)
-						newBluetoothConfig.fixedPin = Int32(config.display.autoScreenCarouselSecs)
+						newBluetoothConfig.fixedPin = Int32(config.bluetooth.fixedPin)
 
 					}
 					fetchedNode[0].bluetoothConfig = newBluetoothConfig
@@ -140,41 +140,40 @@ func localConfig (config: Config, meshlogging: Bool, context:NSManagedObjectCont
 					
 					if isDefault {
 						
-						fetchedNode[0].displayConfig?.screenOnSeconds = 0
-						fetchedNode[0].displayConfig?.screenCarouselInterval = 0
-						fetchedNode[0].displayConfig?.gpsFormat = 0
-						fetchedNode[0].displayConfig?.compassNorthTop = false
+						fetchedNode[0].bluetoothConfig?.enabled = true
+						fetchedNode[0].bluetoothConfig?.mode = Int32(config.bluetooth.mode.rawValue)
+						fetchedNode[0].bluetoothConfig?.fixedPin = Int32("123456") ?? 123456
 						
 					} else {
 
-						fetchedNode[0].displayConfig?.gpsFormat = Int32(config.display.gpsFormat.rawValue)
-						fetchedNode[0].displayConfig?.screenOnSeconds = Int32(config.display.screenOnSecs)
-						fetchedNode[0].displayConfig?.screenCarouselInterval = Int32(config.display.autoScreenCarouselSecs)
-						fetchedNode[0].displayConfig?.compassNorthTop = config.display.compassNorthTop
+						fetchedNode[0].bluetoothConfig?.enabled = config.bluetooth.enabled
+						fetchedNode[0].bluetoothConfig?.mode = Int32(config.bluetooth.mode.rawValue)
+						fetchedNode[0].bluetoothConfig?.fixedPin = Int32(config.bluetooth.fixedPin)
+
 					}
 				}
 				
 				do {
 
 					try context.save()
-					if meshlogging { MeshLogger.log("💾 Updated Display Config for node number: \(String(nodeNum))") }
+					if meshlogging { MeshLogger.log("💾 Updated Bluetooth Config for node number: \(String(nodeNum))") }
 
 				} catch {
 
 					context.rollback()
 
 					let nsError = error as NSError
-					print("💥 Error Updating Core Data DisplayConfigEntity: \(nsError)")
+					print("💥 Error Updating Core Data BluetoothConfigEntity: \(nsError)")
 				}
 			} else {
 				
-				print("💥 No Nodes found in local database matching node number \(nodeNum) unable to save Display Config")
+				print("💥 No Nodes found in local database matching node number \(nodeNum) unable to save Bluetooth Config")
 			}
 			
 		} catch {
 			
 			let nsError = error as NSError
-			print("💥 Fetching node for core data DisplayConfigEntity failed: \(nsError)")
+			print("💥 Fetching node for core data BluetoothConfigEntity failed: \(nsError)")
 		}
 	}
 	
diff --git a/Meshtastic/Views/Settings/Config/BluetoothConfig.swift b/Meshtastic/Views/Settings/Config/BluetoothConfig.swift
index 7b01ea15..e75e4f1d 100644
--- a/Meshtastic/Views/Settings/Config/BluetoothConfig.swift
+++ b/Meshtastic/Views/Settings/Config/BluetoothConfig.swift
@@ -106,7 +106,7 @@ struct BluetoothConfig: View {
 					bc.mode = BluetoothModes(rawValue: mode)?.protoEnumValue() ?? Config.BluetoothConfig.PairingMode.randomPin
 					bc.fixedPin = UInt32(fixedPin) ?? 123456
 					
-					let adminMessageId =  0//bleManager.saveBluetoothConfig(config: bc, fromUser: node!.user!, toUser: node!.user!)
+					let adminMessageId =  bleManager.saveBluetoothConfig(config: bc, fromUser: node!.user!, toUser: node!.user!)
 					
 					if adminMessageId > 0 {