Small update for user enabled field
Updating for tenant list behaviour