HP: Fixes for changing the tenant_name by the user