Remarked user_enabled and tenant_enabled