Allow register/login forms only on checkout
Fix merge conflict
Show checkout fields when login/register option is set to none
Merge branch 'ghost1227-issue/2076' into release/2.0