Improved randomization of subscriber ID

Fixes #1158