diff --git a/I2PTunnel.cpp b/I2PTunnel.cpp
index 51266eb8..014e7028 100644
--- a/I2PTunnel.cpp
+++ b/I2PTunnel.cpp
@@ -249,25 +249,26 @@ namespace client
         
         while (!m_InPacket.eof () && !m_InPacket.fail ())
         {
-                std::getline (m_InPacket, line);
-                auto pos = line.find ("USER");
-                if (pos != std::string::npos && pos == 0)
-                {
-                        pos = line.find (" ");
-                        pos++;
-                        pos = line.find (" ", pos);
-                        pos++;
-                        pos = line.find (" ", pos);
-                        pos++;
-                        auto nextpos = line.find (" ", pos);
+            std::getline (m_InPacket, line);
+            auto pos = line.find ("USER");
+            if (pos != std::string::npos && pos == 0)
+            {
+                pos = line.find (" ");
+                pos++;
+                pos = line.find (" ", pos);
+                pos++;
+                pos = line.find (" ", pos);
+                pos++;
+                auto nextpos = line.find (" ", pos);
 
-                        m_OutPacket << line.substr (0, pos);
-                        m_OutPacket << context.GetAddressBook ().ToAddress (m_From->GetIdentHash ());
-                        m_OutPacket << line.substr (nextpos) << '\n';
-                } else {
-                        m_OutPacket << line << '\n';
-                }
+                m_OutPacket << line.substr (0, pos);
+                m_OutPacket << context.GetAddressBook ().ToAddress (m_From->GetIdentHash ());
+                m_OutPacket << line.substr (nextpos) << '\n';
+            } else {
+                m_OutPacket << line << '\n';
+            }
         }
+        LogPrint (eLogError, m_OutPacket.str ().substr (0, m_OutPacket.str ().length ()));
         I2PTunnelConnection::Write ((uint8_t *)m_OutPacket.str ().c_str (), m_OutPacket.str ().length ());
     }
 
@@ -477,15 +478,15 @@ namespace client
 
     I2PServerTunnelIRC::I2PServerTunnelIRC (const std::string& name, const std::string& address, 
         int port, std::shared_ptr<ClientDestination> localDestination, int inport):
-            I2PServerTunnel (name, address, port, localDestination, inport)
+        I2PServerTunnel (name, address, port, localDestination, inport)
     {
     }
 
     void I2PServerTunnelIRC::CreateI2PConnection (std::shared_ptr<i2p::stream::Stream> stream)
     {
-            auto conn = std::make_shared<I2PTunnelConnectionIRC> (this, stream, std::make_shared<boost::asio::ip::tcp::socket> (GetService ()), GetEndpoint (), GetAddress ());
-            AddHandler (conn);
-            conn->Connect ();
+	    auto conn = std::make_shared<I2PTunnelConnectionIRC> (this, stream, std::make_shared<boost::asio::ip::tcp::socket> (GetService ()), GetEndpoint (), GetAddress ());
+	    AddHandler (conn);
+        conn->Connect ();
     }
 }		
 }