diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/EGammaAmbiguityTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/EGammaAmbiguityTool.h
index cca3b0826903f31fe4d6dec4f4c6b82fed945de8..b0a4850a8185e69e9a9f06b993c629f3b230a4f7 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/EGammaAmbiguityTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/EGammaAmbiguityTool.h
@@ -97,6 +97,8 @@ private:
   float m_minPtCut;
   /** @brief Maximum value for Rconv - RfirstHit for Si+Si conversions where both tracks have innermost hits **/
   float m_maxDeltaR_innermost;
+  /** @brief no vertex && no innermost hit -> amb. Use true in reconstruction to have more ambiguous  **/
+  bool m_noVertexNoInnermostAsAmb;
   /** @When used as a selector reject/accpet ambiguous cases */
   bool m_acceptAmbiguous;  
 }; // End: class definition
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGammaAmbiguityTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGammaAmbiguityTool.cxx
index dbae430acead523727bc5487c4732d43cadf7fe0..ff58722edc868724e9033251baf899107fd01148 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGammaAmbiguityTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/EGammaAmbiguityTool.cxx
@@ -48,8 +48,10 @@ EGammaAmbiguityTool::EGammaAmbiguityTool(const std::string& myname) :
   declareProperty("maxEoverPCut", m_maxEoverPCut = 10,"Maximum EoverP , more that this is ambiguous");
   declareProperty("minPCut",      m_minPtCut = 2000 ,  "Minimum Pt, less than that is ambiguous");
   declareProperty("maxDeltaR_innermost",      m_maxDeltaR_innermost = 40 ,  "Maximum value for Rconv - RfirstHit for Si+Si conversions where both tracks have innermost hits");
+  declareProperty("noVertexNoInnermostAsAmb", m_noVertexNoInnermostAsAmb = true, 
+		  "If true classify as ambiguous when there is no vertex and no innermost Hits. "
+		  "If false classify no vertex as for sure not photon");
   declareProperty("AcceptAmbiguous", m_acceptAmbiguous = true,"When used as a selector accept the ambiguous as default");
-
 }
 
 
@@ -173,7 +175,7 @@ unsigned int EGammaAmbiguityTool::ambiguityResolve(const xAOD::CaloCluster* clus
   //Electron ==> Surely not Photon
   // - Track with at least the minimum Si and Pixel hits (previous selection for photons/ambiguous)
   // - And has E/P < 10 and Pt > 2.0 GeV (previous for ambiguous)
-  // - No vertex Matched
+  // - No vertex Matched (and trk has "innermost pixel hits" when m_noVertexNoInnermostAsAmb is true)
   // - Or if a vertex exists and:
   //   * is not Si+Si 
   //   * is Si+Si but only 1 trk has "innermost pixel hits"
@@ -181,7 +183,7 @@ unsigned int EGammaAmbiguityTool::ambiguityResolve(const xAOD::CaloCluster* clus
   //     Rconv - RfirstHit > maxDeltaR_innermost 
   // In this case we do not want this to be in Photons
   
-  if ( !vx|| 
+  if ( ((trkHasInnermostHit || !m_noVertexNoInnermostAsAmb) && !vx) || 
        (trkHasInnermostHit && (!vxDoubleSi || nTrkVxWithInnermostHit == 1 || !passDeltaR_innermost(*vx))) ){
     ATH_MSG_DEBUG("Returning Electron");
     type=xAOD::AmbiguityTool::electron;