fixed country viewer and login flow