Help waffle cope with new user model