Upgrade to Mojave messed up Guest account

Prior to upgrading to Mojave, I had the Guest account enabled, so that if my laptop went missing, the person could at least access Wifi, and I would know the location through Find My Mac. I have the firmware password on, and I had verified this worked as expected. However, when I upgraded this week, I found the Guest account was now turned off. I turned it back on, and went to test that it still worked as expected. However, now, in order to access the Guest account, during the reboot, it asks for the Firmware password. I've tried turning off the firmware password, going into the guest account, and turning the firmware password back on. However, that doesn't work. I'm completely confused, because the -only- way that Find My Mac will work is if the Guest account has access to Wifi.