diff --git a/Fix-RebootIntoSafeMode.bat b/Fix-RebootIntoSafeMode.bat
index 6a7c80e..173ee64 100644
--- a/Fix-RebootIntoSafeMode.bat
+++ b/Fix-RebootIntoSafeMode.bat
@@ -10,11 +10,12 @@ call :configure-service Syncro
 call :configure-service SyncroLive
 call :configure-service SyncroOvermind
 call :configure-service SplashtopRemoteService
+call :configure-service "Cloud Backup Service Remote Management"
 
 :schedule-normal-reboot
 call :reset-errorlevel
 echo Configuring system to reboot into Normal Mode at next reboot
-reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Runonce" /v "*RestartNormalMode" /t REG_SZ /d "cmd.exe /c %SystemRoot%\System32\bcdedit.exe /deletevalue {default} safeboot" /f > nul 2>&1
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Runonce" /v "*RestartNormalMode" /t REG_SZ /d "bcdedit /deletevalue {current} safeboot" /f > nul 2>&1
 if %ERRORLEVEL% GTR 0 (
 	set /a REBOOT=%REBOOT%+1
 	echo ERROR: could not configure reboot into normal mode
@@ -22,7 +23,7 @@ if %ERRORLEVEL% GTR 0 (
 
 :configure-reboot-safemodewithnetworking
 call :reset-errorlevel
-"%SystemRoot%\System32\bcdedit.exe" /set {default} safeboot network
+bcdedit /set {current} safeboot network
 if %ERRORLEVEL% GTR 0 (
 	set /a REBOOT=%REBOOT%+1
 	echo ERROR: could not restart into Safe Mode with Networking