diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index a2a2f17f74ede9422f5eed090f6588fe094e5d1b..c97310af27cedc02fae385a230022acf4db545c5 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -1545,8 +1545,11 @@ ManagerImpl::initRegisterAccounts()
     while (iter != _accountMap.end()) {
         if (iter->second) {
             iter->second->loadConfig();
-            /* If the account is set as enabled, try to register */
 
+	    // TODO: take off this protection by storing localIPAddress using interface name
+	    setConfig(iter->second->getAccountID(), LOCAL_ADDRESS, "0.0.0.0");
+
+            /* If the account is set as enabled, try to register */
             if (iter->second->isEnabled()) {
                 status = iter->second->registerVoIPLink();
 
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp
index ac9428f0ca7cd5ff698e6e9da73219278c214d51..52f7c3a0dfc1aecb99d237f4fe97a74a7c8f7ddd 100644
--- a/sflphone-common/src/sip/sipaccount.cpp
+++ b/sflphone-common/src/sip/sipaccount.cpp
@@ -338,8 +338,8 @@ void SIPAccount::loadConfig()
     // Do not store or use IP address in config as this address may change
     // Use loadSIPLocalIP for now instead in register/unregister (UDP,STUN,TLS), newOutGoingCall, mod_on_rx_request
     // TODO: if we realy have to bind to a specific interface, store interfaces by name instead
-    setLocalAddress (std::string("0.0.0.0"));
-    // setLocalAddress (Manager::instance().getConfigString (_accountID, LOCAL_ADDRESS));
+    // setLocalAddress (std::string("0.0.0.0"));
+    setLocalAddress (Manager::instance().getConfigString (_accountID, LOCAL_ADDRESS));
 
 
     // Published parameters