Hotfix userid

Backport fix from devel by cherry picking commit into a hotfix branch and rebuilding scripts. Should fix #62.