diff --git a/lib/partner-listener/routers/topup.js b/lib/partner-listener/routers/topup.js
index f9f8fba..7662ec2 100644
--- a/lib/partner-listener/routers/topup.js
+++ b/lib/partner-listener/routers/topup.js
@@ -65,7 +65,8 @@ function pagePrerequisite(req, res, next) {
 async function pageIndex(req, res) {
     const { xid } = res.locals;
 
-    const terminalName = `${req.body.terminal_name || req.query.terminal_name}@${req.ip.replace(/^::ffff:/, '')}`;
+    const terminalNameWithoutIp = ((req.body.terminal_name || req.query.terminal_name) || '').trim();
+    const terminalName = `${terminalNameWithoutIp}@${req.ip.replace(/^::ffff:/, '')}`;
 
     const qs = {
         terminal_name: terminalName,
@@ -79,7 +80,7 @@ async function pageIndex(req, res) {
         reverse_url: req.body.reverse_url || req.query.reverse_url || null,
     };
 
-    if (terminalsWithLocation.indexOf(terminalName.toLowerCase()) >= 0) {
+    if (terminalsWithLocation.indexOf(terminalNameWithoutIp.toLowerCase()) >= 0) {
         const location = req.body.location
             || req.body.location_id
             || req.query.location