diff --git a/doc/THANKS b/doc/THANKS
index f67c4f952..f054be22e 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -360,6 +360,9 @@ Marek Sarvas <marek.sarvas@gmail.com>
 Philippe A. R. Schaeffer <schaeff@compuphil.de>
     for reporting a minor bug
 
+Jorge Santos <jorge_a_santos@hotmail.com>
+    for reporting a minor bug
+
 Sven Schluter <sschlueter@netzwerk.cc>
     for providing with a patch for waiting a number of seconds between
     each HTTP request
diff --git a/lib/core/dump.py b/lib/core/dump.py
index 806046121..f96534fff 100644
--- a/lib/core/dump.py
+++ b/lib/core/dump.py
@@ -104,17 +104,13 @@ class Dump:
         self.string("current user", data)
 
     def currentDb(self,data):
-        if Backend.getIdentifiedDbms() in (DBMS.MAXDB, DBMS.ORACLE):
+        if Backend.getIdentifiedDbms() == DBMS.MAXDB:
             self.string("current database (no practical usage on %s)" % Backend.getIdentifiedDbms(), data)
+        elif Backend.getIdentifiedDbms() == DBMS.ORACLE:
+            self.string("current schema (equivalent to database on %s)" % Backend.getIdentifiedDbms(), data)
         else:
             self.string("current database", data)
 
-        if Backend.getIdentifiedDbms() in (DBMS.ORACLE):
-            warnMsg  = "on %s you have to use switch '--current-user' to " % Backend.getIdentifiedDbms()
-            warnMsg += "retrieve current schema name which can be used "
-            warnMsg += "as an equivalent to database name (-D) in further runs"
-            logger.warning(warnMsg)
-
     def dba(self,data):
         self.string("current user is DBA", data)
 
diff --git a/xml/queries.xml b/xml/queries.xml
index a690aec60..8988ceb4c 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -230,7 +230,11 @@
         <inference query="ASCII(SUBSTR((%s),%d,1)) > %d"/>
         <banner query="SELECT banner FROM v$version WHERE ROWNUM=1"/>
         <current_user query="SELECT USER FROM DUAL"/>
+        <!--
+        NOTE: current physical DB but not usable for enumeration
         <current_db query="SELECT SYS.DATABASE_NAME FROM DUAL"/>
+        -->
+        <current_db query="SELECT USER FROM DUAL"/>
         <!--
              NOTE: in Oracle to check if the session user is DBA you can use:
              SELECT USERENV('ISDBA') FROM DUAL