Fix code after feedback, add ability to disable guest orders

Now I see. Yes this one was broken and seems like we can't simply fix it. The simplest solution is left as is. 
I will create test for this case, because it is not covered, that why I have miss that.