site's client name is reset even though I can change it

If I do not have the "administer site" (sic: it's now "administer sites") permission, the default client name in the site edit form is set to my own client, that is: if I do not have access (through the ACL) to the client I am editing, it changes the owner of the site, even though I am able to change the client to the right user and i can edit the site!!

In other words, let's say I have a site that belongs to client B and I am user A that has access to client A (but I have "administer clients" so I change the client anyways)... When I load the site edition form of that site, it's going to set the client field to "client A", instead of "client B". I need to manually change the client back to "client B" so that editing the site will not change the client.