remove console.logs and add email, username fallback