s3: Fix but 7145 -- duplicate sam and unix accounts