DDF-419: Fixed template problem and moved user.js to model