diff --git a/cowrie/core/output.py b/cowrie/core/output.py
index 2d6ccb5..9259471 100644
--- a/cowrie/core/output.py
+++ b/cowrie/core/output.py
@@ -31,7 +31,6 @@ import datetime
 import re
 import copy
 import socket
-import uuid
 
 # KIPP0001 : create session
 # KIPP0002 : succesful login
@@ -144,9 +143,9 @@ class Output(object):
 
         # connection event is special. adds to session list
         if ev['eventid'] == 'KIPP0001':
-            self.sessions[sessionno] = uuid.uuid4().hex
+            self.sessions[sessionno] = ev['id']
             self.ips[sessionno] = ev['src_ip']
-            del ev['system']
+            del ev['id']
 
         ev['session'] = self.sessions[sessionno]
 
diff --git a/cowrie/core/ssh.py b/cowrie/core/ssh.py
index da2f785..38a09c6 100644
--- a/cowrie/core/ssh.py
+++ b/cowrie/core/ssh.py
@@ -232,7 +232,7 @@ class HoneyPotTransport(transport.SSHServerTransport):
            format='New connection: %(src_ip)s:%(src_port)s (%(dst_ip)s:%(dst_port)s) [session: %(sessionno)s]',
            src_ip=self.transport.getPeer().host, src_port=self.transport.getPeer().port,
            dst_ip=self.transport.getHost().host, dst_port=self.transport.getHost().port,
-           sessionno=self.transport.sessionno)
+           id=self.transportId, sessionno=self.transport.sessionno)
 
         self.transport.write('%s\r\n' % (self.ourVersionString,))
         self.currentEncryptions = transport.SSHCiphers('none', 'none', 'none', 'none')