diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index 5e21a848eeb2ab3fd516e198442bca6d1599a133..56c72f03457c393a5ecf5364fe217dc2f3c45302 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -171,7 +171,6 @@ std::shared_ptr<SIPCall>
 SIPAccount::newOutgoingCall(const std::string& toUrl)
 {
     std::string to;
-    std::string toUri;
     int family;
 
     auto& manager = Manager::instance();
@@ -205,12 +204,7 @@ SIPAccount::newOutgoingCall(const std::string& toUrl)
         RING_DBG("UserAgent: New registered account call to %s", toUrl.c_str());
     }
 
-    // If toUrl is not a well formatted sip URI, use account information to process it
-    if (toUrl.find("sip:") != std::string::npos or
-        toUrl.find("sips:") != std::string::npos)
-        toUri = toUrl;
-    else
-        toUri = getToUri(to);
+    auto toUri = getToUri(to);
     call->initIceTransport(true);
 
     call->setIPToIP(isIP2IP());
@@ -2078,12 +2072,7 @@ SIPAccount::sendTextMessage(const std::string& to, const std::map<std::string, s
         return;
     }
 
-    std::string toUri;
-    if (to.find("sip:") != std::string::npos or
-        to.find("sips:") != std::string::npos)
-        toUri = to;
-    else
-        toUri = getToUri(to);
+    auto toUri = getToUri(to);
 
     const pjsip_method msg_method = {PJSIP_OTHER_METHOD, CONST_PJ_STR("MESSAGE")};
     std::string from(getFromUri());