Fixes #69 and bugs introduced when moving to user.js