Fix X-LS logic on login