Fix Developer ID to respect different scenarios