Just wanted to share the solution I'm using. This keeps the menu option 'Advanced options' but when choosing this and letting the computer restart you just return to the 'normal' log on screen.
bcdedit /deletevalue {current} recoverysequence
bcdedit /set {bootmgr} bootems off
bcdedit /set {bootmgr} advancedoptions off
bcdedit /set {bootmgr} optionsedit off
bcdedit /set {bootmgr} recoveryenabled off
bcdedit /set {current} bootems off
bcdedit /set {current} advancedoptions off
bcdedit /set {current} optionsedit off
bcdedit /set {current} bootstatuspolicy IgnoreAllFailures
bcdedit /set {current} recoveryenabled off
The bcdedit lines I added myself I just copied from the 'safe mode lockdown settings' I use on W7. Maybe they aren't all needed for W10 but it seems to work and I just started testing with W10 today (as we are thinking of 'upgrading' from W7 to W10 next year) so I didn't check if any of the lines can be omitted.
