diff --git a/app/MetaGer.php b/app/MetaGer.php
index 46b98c89a8cdf4a8e01b63fd5760330d1507f8f9..166990284ffe53caee9e4e553321993d39c11c8e 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -871,6 +871,10 @@ class MetaGer
         $this->q       = strtolower($this->eingabe);
         # IP
         $this->ip = $request->ip();
+        # Unser erster Schritt wird sein, IP-Adresse und USER-Agent zu anonymisieren, damit
+        # nicht einmal wir selbst noch Zugriff auf die Daten haben:
+        $this->ip = preg_replace("/(\d+)\.(\d+)\.\d+.\d+/s", "$1.$2.0.0", $this->ip);
+
         # Language
         if (isset($_SERVER['HTTP_LANGUAGE'])) {
             $this->language = $_SERVER['HTTP_LANGUAGE'];
@@ -1153,12 +1157,9 @@ class MetaGer
             {
                 $logEntry = "";
                 $logEntry .= "[" . date(DATE_RFC822, mktime(date("H"), date("i"), date("s"), date("m"), date("d"), date("Y"))) . "]";
+                $logEntry .= " ip=" . $this->request->ip();
                 $logEntry .= " pid=" . getmypid();
                 $logEntry .= " ref=" . $this->request->header('Referer');
-                $useragent = $this->request->header('User-Agent');
-                $useragent = str_replace("(", " ", $useragent);
-                $useragent = str_replace(")", " ", $useragent);
-                $useragent = str_replace(" ", "", $useragent);
                 $logEntry .= " time=" . round((microtime(true) - $this->starttime), 2) . " serv=" . $this->fokus;
                 $logEntry .= " search=" . $this->eingabe;
 
diff --git a/public/index.php b/public/index.php
index 7b011c51f4a8819d6723dcb05e8c0a9296f52528..b67e0a6e9b0ce993d445cd7ffb898622f8f8d4c3 100644
--- a/public/index.php
+++ b/public/index.php
@@ -13,13 +13,6 @@ if (isset($_SERVER["HTTP_FORWARDED"]) && isset($_SERVER["HTTP_X_FORWARDED_FOR"])
     unset($_SERVER["HTTP_FORWARDED"]);
 }
 
-# Unser erster Schritt wird sein, IP-Adresse und USER-Agent zu anonymisieren, damit
-# nicht einmal wir selbst noch Zugriff auf die Daten haben:
-if (!isset($_SERVER['HTTP_X_FORWARDED_FOR']) && isset($_SERVER['REMOTE_ADDR'])) {
-    $_SERVER['REMOTE_ADDR'] = preg_replace("/(\d+)\.(\d+)\.\d+.\d+/s", "$1.$2.0.0", $_SERVER['REMOTE_ADDR']);
-} elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-    $_SERVER['HTTP_X_FORWARDED_FOR'] = preg_replace("/(\d+)\.(\d+)\.\d+.\d+/s", "$1.$2.0.0", $_SERVER['HTTP_X_FORWARDED_FOR']);
-}
 if (isset($_SERVER['HTTP_USER_AGENT'])) {
     $agentPieces = explode(" ", $_SERVER['HTTP_USER_AGENT']);