Better handling of fallback contac details