diff --git a/src/core/sat_main.py b/src/core/sat_main.py
index cb08fc2c..fb45762b 100644
--- a/src/core/sat_main.py
+++ b/src/core/sat_main.py
@@ -37,7 +37,7 @@ from wokkel.xmppim import RosterItem
 
 from sat.bridge.DBus import DBusBridge
 import logging
-from logging import debug, info, error
+from logging import debug, info, warning, error
 
 import sys
 import os.path
@@ -539,6 +539,7 @@ class SAT(service.Service):
         defer_list = []
         for item in disco_result._items:
             if item.entity.full().count('.') == 1: #XXX: workaround for a bug on jabberfr, tmp
+                warning(_('Using jabberfr workaround, be sure your domain has at least two levels (e.g. "example.tld", not "example" alone)'))
                 continue
             args = [item.entity, profile] 
             defer_list.append(disco_client.requestInfo(item.entity).addCallbacks(_check_entity_cb, _errback, args, None, args))
diff --git a/src/memory/memory.py b/src/memory/memory.py
index 5473acc0..a83269d9 100644
--- a/src/memory/memory.py
+++ b/src/memory/memory.py
@@ -640,7 +640,8 @@ class Memory:
         """Helper method to get first available entity for a service"""
         entities = self.getServerServiceEntities(category, type, profile)
         if entities == None:
-            warning(_("Entities not available, maybe they haven't been asked to server yet ?"))
+            warning(_("Entities (%(category)s/%(type)s) not available, maybe they haven't been asked to server yet ?") % {"category":category,
+                                                                                                                          "type":type})
             return None
         else:
             return list(entities)[0] if entities else None