Add wait check to user init