This seems like it should be taken care of in user.js