fixed user.js
trying to merge