diff --git a/src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java b/src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java
index e5ea194a62aa25c47cacf3bde70cf5b845ab2d26..990f478dd50c1867890b876fccfc66760c9931b1 100644
--- a/src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java
+++ b/src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java
@@ -466,7 +466,7 @@ public List<String> getPropertyNamesByPrefix(String prefix,
                                  resultKeySet);
 
         //finally, get property names from mutable default property set.
-        if(immutableDefaultProperties.size() > 0)
+        if(defaultProperties.size() > 0)
         {
             propertyNameSet = defaultProperties.keySet();
 
@@ -1588,7 +1588,7 @@ private void loadDefaultProperties(String fileName)
                     continue;
                 }
 
-                if (name.startsWith("!"))
+                if (name.startsWith("*"))
                 {
                     name = name.substring(1);