changed datastore values to EmailProperty