diff --git a/Control/AthenaMonitoring/AthenaMonitoring/AthenaMon.h b/Control/AthenaMonitoring/AthenaMonitoring/AthenaMon.h
index aa2f999680a8754b27e88b696465ecad918df37e..a7765d4dcda09a1c182ebfb311399f749503c664 100755
--- a/Control/AthenaMonitoring/AthenaMonitoring/AthenaMon.h
+++ b/Control/AthenaMonitoring/AthenaMonitoring/AthenaMon.h
@@ -5,11 +5,11 @@
 #ifndef ATHENAMON_H
 #define ATHENAMON_H
 
-#include "GaudiKernel/Algorithm.h"
+#include "AthenaBaseComps/AthAlgorithm.h"
 
 #include "AthenaMonitoring/IMonitorToolBase.h"
 
-class AthenaMon:public Algorithm {
+class AthenaMon:public AthAlgorithm {
  public:
 
   AthenaMon (const std::string& name, ISvcLocator* pSvcLocator);
diff --git a/Control/AthenaMonitoring/AthenaMonitoring/MonitorToolBase.h b/Control/AthenaMonitoring/AthenaMonitoring/MonitorToolBase.h
index c489cb48ed3d36519cbb1d74e3cbaa4c1ceaa1dd..76668d2cf468a54ec15e2aece7cf7c419ea8a6c4 100755
--- a/Control/AthenaMonitoring/AthenaMonitoring/MonitorToolBase.h
+++ b/Control/AthenaMonitoring/AthenaMonitoring/MonitorToolBase.h
@@ -5,7 +5,7 @@
 #ifndef MONITORTOOLBASE_H
 #define MONITORTOOLBASE_H
 
-#include "GaudiKernel/AlgTool.h"
+#include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/IHistogramSvc.h"
 #include "GaudiKernel/ITHistSvc.h"
 
@@ -15,7 +15,7 @@
 #include <vector>
 #include <map>
 
-class MonitorToolBase : public AlgTool,
+class MonitorToolBase : public AthAlgTool,
 			virtual public IMonitorToolBase
                          
 {
diff --git a/Control/AthenaMonitoring/python/DQMonFlags.py b/Control/AthenaMonitoring/python/DQMonFlags.py
index 618f5dda9a22addb332ec270f0d2cbbfc8120b29..98d339b78289b25d9f76d37cefdd8fccaa18c9cf 100644
--- a/Control/AthenaMonitoring/python/DQMonFlags.py
+++ b/Control/AthenaMonitoring/python/DQMonFlags.py
@@ -370,6 +370,13 @@ class disableFilledBunchFilter(JobProperty):
     StoredValue=False
 list+=[disableFilledBunchFilter]
 
+class enableLumiAccess(JobProperty):
+    """ If set to false, will force lumi tool access off """
+    statusOn=True
+    allowedTypes=['bool']
+    StoredValue=True
+list+=[enableLumiAccess]
+
 ##-----------------------------------------------------------------------------
 ## 2nd step
 ## Definition of the DQMon flag container
diff --git a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
index 7c6279b57f7b333a0a7fb26c403fd4a68727d511..97be8d67b25f8e83587c97121c84f5fcd97d59ff 100644
--- a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
@@ -18,8 +18,8 @@ if DQMonFlags.doMonitoring():
          include("AthenaMonitoring/TrigDecTool_jobOptions.py")
 
 
-   # don't set up lumi access if in MC
-   if globalflags.DataSource.get_Value() != 'geant4':
+   # don't set up lumi access if in MC or enableLumiAccess == False
+   if globalflags.DataSource.get_Value() != 'geant4' and DQMonFlags.enableLumiAccess():
       if not hasattr(ToolSvc,"LuminosityTool"):
          if athenaCommonFlags.isOnline:
             local_logger.debug("luminosity tool not found, importing online version")
@@ -253,8 +253,8 @@ if DQMonFlags.doMonitoring():
    for tool in monToolSet_after-monToolSet_before:
       # if we have the FilterTools attribute, assume this is in fact a
       # monitoring tool
-      # stop lumi access if we're in MC
-      if globalflags.DataSource.get_Value() == 'geant4':
+      # stop lumi access if we're in MC or enableLumiAccess == False
+      if globalflags.DataSource.get_Value() == 'geant4' or not DQMonFlags.enableLumiAccess():
          if 'EnableLumi' in dir(tool):
             tool.EnableLumi = False
       if DQMonFlags.monToolPostExec():
diff --git a/Control/AthenaMonitoring/src/AthenaMon.cxx b/Control/AthenaMonitoring/src/AthenaMon.cxx
index 430162991cd2197d57f05c3118d6c48c2a78b7d2..1950ddbd5557db0362167df10144becefa176dda 100755
--- a/Control/AthenaMonitoring/src/AthenaMon.cxx
+++ b/Control/AthenaMonitoring/src/AthenaMon.cxx
@@ -24,7 +24,7 @@ class ISvcLocator;
 
 /*---------------------------------------------------------------*/
 AthenaMon::AthenaMon(const std::string& name, ISvcLocator* pSvcLocator) :
-  Algorithm(name, pSvcLocator)
+  AthAlgorithm(name, pSvcLocator)
 {   
   MsgStream log(msgSvc(), "AthenaMon");
   
diff --git a/Control/AthenaMonitoring/src/MonitorToolBase.cxx b/Control/AthenaMonitoring/src/MonitorToolBase.cxx
index 5d0b666aa21a201264a845aed5e8e99155bba479..952f1ada4f321a0a30b97de1b533a2f7ac90e5f8 100755
--- a/Control/AthenaMonitoring/src/MonitorToolBase.cxx
+++ b/Control/AthenaMonitoring/src/MonitorToolBase.cxx
@@ -27,7 +27,7 @@
 MonitorToolBase::MonitorToolBase(const std::string & type, 
 				 const std::string & name,
 				 const IInterface* parent)
-  : AlgTool(type, name, parent)
+  : AthAlgTool(type, name, parent)
     , m_histsvc(0)
     , m_rootsvc(0)
     , m_isBooked(false)