diff --git a/core/include/ws_client.h b/core/include/ws_client.h
index f200e95..6f0e68e 100644
--- a/core/include/ws_client.h
+++ b/core/include/ws_client.h
@@ -44,8 +44,7 @@ public:
      * @pre This class will not connect up the ports to each other in any way. Unless some setup is done, this class
      * by default will never be prompted to read and/or write from/to either of the sockets.
      */
-    WSClient(QTcpSocket* p_tcp_socket, QWebSocket* p_web_socket, QObject* parent = nullptr)
-        : QObject(parent), tcp_socket(p_tcp_socket), web_socket(p_web_socket) {};
+    WSClient(QTcpSocket* p_tcp_socket, QWebSocket* p_web_socket, QObject* parent = nullptr);
 
     /**
       * @brief Destructor for the WSClient class.
@@ -114,6 +113,11 @@ private:
      * @brief Flag that is set when packets are segmented
      */
     bool is_segmented = false;
+
+    /**
+     * @brief The IP send in the WSIP packet
+     */
+    QString websocket_ip;
 };
 
 #endif // WS_CLIENT_H
diff --git a/core/src/advertiser.cpp b/core/src/advertiser.cpp
index 29e8635..906f9f7 100644
--- a/core/src/advertiser.cpp
+++ b/core/src/advertiser.cpp
@@ -1,3 +1,20 @@
+//////////////////////////////////////////////////////////////////////////////////////
+//    akashi - a server for Attorney Online 2                                       //
+//    Copyright (C) 2020  scatterflower                                             //
+//                                                                                  //
+//    This program is free software: you can redistribute it and/or modify          //
+//    it under the terms of the GNU Affero General Public License as                //
+//    published by the Free Software Foundation, either version 3 of the            //
+//    License, or (at your option) any later version.                               //
+//                                                                                  //
+//    This program is distributed in the hope that it will be useful,               //
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of                //
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 //
+//    GNU Affero General Public License for more details.                           //
+//                                                                                  //
+//    You should have received a copy of the GNU Affero General Public License      //
+//    along with this program.  If not, see <https://www.gnu.org/licenses/>.        //
+//////////////////////////////////////////////////////////////////////////////////////
 #include "include/advertiser.h"
 
 Advertiser::Advertiser()
diff --git a/core/src/ws_client.cpp b/core/src/ws_client.cpp
index d4cb46a..8f7b04f 100644
--- a/core/src/ws_client.cpp
+++ b/core/src/ws_client.cpp
@@ -61,10 +61,25 @@ void WSClient::onTcpDisconnect()
 
 void WSClient::onTcpConnect()
 {
-    tcp_socket->write(QString("WSIP#" + web_socket->peerAddress().toString() + "#%").toUtf8());
+    tcp_socket->write(QString("WSIP#" + websocket_ip + "#%").toUtf8());
     tcp_socket->flush();
 }
 
+WSClient::WSClient(QTcpSocket *p_tcp_socket, QWebSocket *p_web_socket, QObject *parent)
+    : QObject(parent),
+      tcp_socket(p_tcp_socket),
+      web_socket(p_web_socket)
+{
+    QNetworkRequest l_request = web_socket->request();
+    if (l_request.hasRawHeader("x-forwarded-for")) {
+        websocket_ip = l_request.rawHeader("x-forwarded-for");
+    }
+    else {
+        websocket_ip = web_socket->peerAddress().toString();
+    }
+    qDebug() << websocket_ip;
+}
+
 WSClient::~WSClient()
 {
     tcp_socket->deleteLater();