Changed token callback to only fire on create before