diff --git a/partner-simplepay.js b/partner-simplepay.js
index 23e0b14..5b0ebff 100644
--- a/partner-simplepay.js
+++ b/partner-simplepay.js
@@ -128,6 +128,10 @@ function _composeCompleteSn(responseDataObj) {
         total_kwh: _getPropertyFromObjectSafe(info, 'size')
     }
 
+    if (cleanedData.token) {
+        cleanedData.token = cleanedData.token.replace(/ /g, '-');
+    }
+
     if (cleanedData.cust_name) {
         cleanedData.cust_name = cleanedData.cust_name.replace(/\W+/g, ' ').trim().replace(/\W+/g, '-').toUpperCase();
     }