diff --git a/lib/routes/pollingRoutes.js b/lib/routes/pollingRoutes.js
index f6a54828..e24df87d 100644
--- a/lib/routes/pollingRoutes.js
+++ b/lib/routes/pollingRoutes.js
@@ -38,8 +38,10 @@ function poll (req, res, next) {
   const triggers = configManager.getTriggers(settings.config)
 
   const operatorInfo = configManager.getOperatorInfo(settings.config)
+  const machineInfo = { deviceId: req.deviceId, deviceName: req.deviceName }
   const cashOutConfig = configManager.getCashOut(deviceId, settings.config)
   const receipt = configManager.getReceipt(settings.config)
+  const terms = configManager.getTermsConditions(settings.config)
 
   state.pids[deviceId] = { pid, ts: Date.now() }
 
@@ -75,6 +77,7 @@ function poll (req, res, next) {
         hasLightning,
         receipt,
         operatorInfo,
+        machineInfo,
         triggers
       }
 
@@ -97,7 +100,7 @@ function poll (req, res, next) {
       // BACKWARDS_COMPATIBILITY 7.4.9
       // machines before 7.4.9 expect t&c on poll
       if (!machineVersion || semver.lt(machineVersion, '7.4.9')) {
-        response.terms = config.termsScreenActive && config.termsScreenText ? createTerms(config) : null
+        response.terms = createTerms(terms)
       }
 
       return res.json(_.assign(response, results))