Recoded email signup with upsert