Added handling for already licensed or remote enabled users