diff --git a/lib/core/option.py b/lib/core/option.py
index bf3d70d4f..8953b8bf5 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1458,7 +1458,7 @@ def __useWizardInterface():
         choice = readInput(message, default='1')
 
         if choice == '2':
-            map(lambda x: conf.__setitem__(x, True), ['getBanner', 'getCurrentUser', 'getCurrentDb', 'isDba', 'getUsers', 'getDbs', 'getTables', 'excludeSysDbs'])
+            map(lambda x: conf.__setitem__(x, True), ['getBanner', 'getCurrentUser', 'getCurrentDb', 'isDba', 'getUsers', 'getDbs', 'getTables', 'getSchema', 'excludeSysDbs'])
         elif choice == '3':
             map(lambda x: conf.__setitem__(x, True), ['getBanner', 'getCurrentUser', 'getCurrentDb', 'isDba', 'getUsers', 'getPasswordHashes', 'getPrivileges', 'getRoles', 'dumpAll'])
         else:
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index e410b58e1..644911ad3 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -1238,9 +1238,9 @@ class Enumeration:
         self.getTables()
 
         infoMsg = "fetched tables: "
-        infoMsg += ", ".join(["%s" % ", ".join("%s%s%s" % (db, ".." if \
+        infoMsg += ", ".join(["%s" % ", ".join("%s%s%s" % (unsafeSQLIdentificatorNaming(db), ".." if \
                    Backend.isDbms(DBMS.MSSQL) or Backend.isDbms(DBMS.SYBASE) \
-                   else ".", t) for t in tbl) for db, tbl in \
+                   else ".", unsafeSQLIdentificatorNaming(t)) for t in tbl) for db, tbl in \
                    kb.data.cachedTables.items()])
         logger.info(infoMsg)