actually, this was a major reason why I did the bucket entry point / instance separation. It changed a bit, now we're only doing it if bucket is actually linked to the user.