diff --git a/CREDITS b/CREDITS
index bb743e2f3a..3cc9b2054f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -82,6 +82,7 @@ Damien Grandemange <damien.grandemange@gmail.com>
 Barham, Chris <cbarham@tnsi.com>
 Geoff Chiang <geoffchiang@gmail.com>
 Jason Smith <jsmith@marqeta.com>
+Will Currie <wscurrie@gmail.com>
 
 Contributors from other OpenSource projects
 -------------------------------------------
diff --git a/jpos/src/main/java/org/jpos/iso/ISOServer.java b/jpos/src/main/java/org/jpos/iso/ISOServer.java
index ee87b76f37..cb524a1c1b 100644
--- a/jpos/src/main/java/org/jpos/iso/ISOServer.java
+++ b/jpos/src/main/java/org/jpos/iso/ISOServer.java
@@ -106,7 +106,8 @@ public void run() {
             if (channel instanceof BaseChannel) {
                 LogEvent ev = new LogEvent (this, "session-start");
                 Socket socket = ((BaseChannel)channel).getSocket ();
-                realm = realm + socket.getInetAddress();
+                realm = realm + "/" + socket.getInetAddress().getHostAddress() + ":"
+                        + socket.getPort();
                 try {
                     checkPermission (socket, ev);
                 } catch (ISOException e) {