diff --git a/daemon/src/sip/sipaccount.cpp b/daemon/src/sip/sipaccount.cpp
index 191728546e5c85d2b8770df5c62bd502af13c1d7..89926099eaae817cfeeada80c8239104edb78f07 100644
--- a/daemon/src/sip/sipaccount.cpp
+++ b/daemon/src/sip/sipaccount.cpp
@@ -432,6 +432,16 @@ void SIPAccount::setAccountDetails (std::map<std::string, std::string> details)
     setTlsRequireClientCertificate (details[TLS_REQUIRE_CLIENT_CERTIFICATE] == "true");
     setTlsNegotiationTimeoutSec (details[TLS_NEGOTIATION_TIMEOUT_SEC]);
     setTlsNegotiationTimeoutMsec (details[TLS_NEGOTIATION_TIMEOUT_MSEC]);
+
+    if (getCredentialCount() == 0) { // credentials not set, construct 1 entry
+        std::vector<std::map<std::string, std::string> > v;
+        std::map<std::string, std::string> map;
+        map[USERNAME] = getUsername();
+        map[PASSWORD] = details[PASSWORD];
+        map[REALM]    = "*";
+        v.push_back(map);
+        setCredentials(v);
+    }
 }
 
 std::map<std::string, std::string> SIPAccount::getAccountDetails() const