NUC8 freezes after login.

So I followed this https://www.youtube.com/watch?v=p3epD8qqVeA and got it working.

I'm in a NUC8i7BEH2.

But when i do a reboot from within OSX it freezes after I login the next time.

Sometimes when I force a reboot with the power button it works fine, but most times it also freezes.

Any ideas are welcome.