Fix displaying order when user is not present and remove check for hasActivated