Add remote idendity in two phase for compatibility