diff --git a/sflphone-common/src/preferences.cpp b/sflphone-common/src/preferences.cpp
index daf723ff6a8f36fe24f81199317ead0fdbe149fb..7eba0cd3cf8ecf78296ff13c38d68162f263786e 100644
--- a/sflphone-common/src/preferences.cpp
+++ b/sflphone-common/src/preferences.cpp
@@ -103,7 +103,7 @@ void Preferences::unserialize (Conf::MappingNode *map)
     Conf::ScalarNode *val;
 
     if (!map) {
-	_debug("Preference: Did not find general preferences");
+        _debug ("Preference: Did not find general preferences");
         return;
     }
 
@@ -233,7 +233,7 @@ void VoipPreference::unserialize (Conf::MappingNode *map)
     Conf::ScalarNode *val = NULL;
 
     if (!map) {
-	_debug("VoipPreference: Did not find voip preference");
+        _debug ("VoipPreference: Did not find voip preference");
         return;
     }
 
@@ -324,7 +324,7 @@ void AddressbookPreference::unserialize (Conf::MappingNode *map)
     Conf::ScalarNode *val = NULL;
 
     if (!map) {
-	_debug("Addressbook: Did not find addressbook preferences");
+        _debug ("Addressbook: Did not find addressbook preferences");
         return;
     }
 
@@ -422,7 +422,7 @@ void HookPreference::unserialize (Conf::MappingNode *map)
     _debug ("Hook: Unserialize preference");
 
     if (!map) {
-	_debug("Hook: Did not find hook preference");
+        _debug ("Hook: Did not find hook preference");
         return;
     }
 
@@ -560,7 +560,7 @@ void AudioPreference::unserialize (Conf::MappingNode *map)
     _debug ("AudioPreference: Unserialize configuration");
 
     if (!map) {
-	_debug("AudioPreference: Did not find audio preferences");	
+        _debug ("AudioPreference: Did not find audio preferences");
         return;
     }
 
@@ -784,7 +784,7 @@ void ShortcutPreferences::unserialize (Conf::MappingNode *map)
     _debug ("ShortcutPreference: Unserialize shortcut");
 
     if (!map) {
-	_debug("ShortcutPreference: Could not find shortcut preferences");
+        _debug ("ShortcutPreference: Could not find shortcut preferences");
         return;
     }
 
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp
index 7a6a07e64214a5f38f94faf630556fa9dfc4183b..9c86fd92190e1afaf86218a07f53c2354b884495 100644
--- a/sflphone-common/src/sip/sipaccount.cpp
+++ b/sflphone-common/src/sip/sipaccount.cpp
@@ -446,8 +446,8 @@ void SIPAccount::unserialize (Conf::MappingNode *map)
     _stunServerName = pj_str ( (char*) _stunServer.data());
 
     credMap = (Conf::MappingNode *) (map->getValue (credKey));
-    
-    if(credMap)
+
+    if (credMap)
         credentials.unserialize (credMap);
 
     val = (Conf::ScalarNode *) (map->getValue (displayNameKey));