diff --git a/lib/roles/app.js b/lib/roles/app.js
index f5201d8c..f06b78e3 100644
--- a/lib/roles/app.js
+++ b/lib/roles/app.js
@@ -613,7 +613,7 @@ module.exports = function(options) {
         .on('forward.test', function(channel, responseChannel, data) {
           joinChannel(responseChannel)
           if (!data.targetHost || data.targetHost === 'localhost') {
-            data.targetHost = ip
+            data.targetHost = socket.request.ip
           }
           push.send([
             channel
@@ -625,7 +625,7 @@ module.exports = function(options) {
         })
         .on('forward.create', function(channel, responseChannel, data) {
           if (!data.targetHost || data.targetHost === 'localhost') {
-            data.targetHost = ip
+            data.targetHost = socket.request.ip
           }
           dbapi.addUserForward(user.email, data)
             .then(function() {