Fix tenant, user position bug