Better fix for restore request after login