Merge "Make user rights conflict error a bit more obvious"