Stuck in "minimal safe mode" boot cycle

Hi, I was just in the process of changing my SATA hard drives over to using AHCI instead of IDE. Following some instructions from the web I issued the command "bcdedit /set{current} safeboot minimal". I rebooted the machine and sure enough it booted into safe mode. It was only at this point that I realised that I required the login password. Now I normally use a PIN and I have recently changed the Microsoft account password from another machine. However, this machine, because it has no network connection, is apparently not using the new password, it's using the cached version of the old one. Unfortunately I can't recall what the old one was (I use long random strings).

So what I need to do is to persuade the machine to return to a normal boot, at which point I can log in using the PIN and sort out the password. However I have been able to find no way to reset the boot option to normal other than first logging on in safe mode, which I can't do.

So does anybody know any way to reset the boot option to Normal which does not involve logging on and getting a command prompt up first? Is there any way to change/delete the bcdedit setting without actually logging on first? My only other option seems to be a complete rebuild .

Can you get into msconfig and the boot tab and uncheck the safemode box. Click Apply, OK and reboot.