diff --git a/Pilot/pilotCommands.py b/Pilot/pilotCommands.py
index 48820d5a..0b107c94 100644
--- a/Pilot/pilotCommands.py
+++ b/Pilot/pilotCommands.py
@@ -561,6 +561,9 @@ def execute(self):
         """
         self.pp.flavour, self.pp.pilotReference, self.pp.batchSystemInfo = getSubmitterInfo(self.pp.ceName)
 
+        if not self.pp.pilotReference:
+            self.pp.pilotReference = self.pp.pilotUUID
+
         self._getBasicsCFG()
         self._getSecurityCFG()
 
@@ -645,8 +648,8 @@ def __init__(self, pilotParams):
     def execute(self):
         """Calls dirac-admin-add-pilot"""
 
-        if not which("dirac-admin-add-pilot") or not self.pp.pilotReference:
-            self.log.info("Skipping module")
+        if not self.pp.pilotReference:
+            self.log.warn("Skipping module, no pilot reference found")
             return
 
         if self.pp.localConfigFile: