Comment 12 for bug 1161963

@Dolph: Thanks, your fix looks good. I removed the tenantId from the DB manually when testing, but I was thinking of a case like:

Create user with no tenantId specified
Add user to tenant x
Set user's default tenant to tenant x

The root cause is the same though, so your existing test covers it.