Handle registration after guest checkout + bug fixes