changes to user model as per #217, requires migrate