diff --git a/src/client.cpp b/src/client.cpp
index 07516d94..6447f845 100755
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -26,7 +26,8 @@
 
 
 /* Implementation *************************************************************/
-CClient::CClient() : bRun ( false ), Socket ( &Channel ),
+CClient::CClient ( const quint16 iPortNumber ) : bRun ( false ),
+    Socket ( &Channel, iPortNumber ),
     iAudioInFader ( AUD_FADER_IN_MAX / 2 ),
     iReverbLevel ( AUD_REVERB_MAX / 6 ),
     bReverbOnLeftChan ( false ),
diff --git a/src/client.h b/src/client.h
index f1cde00c..c27810bc 100755
--- a/src/client.h
+++ b/src/client.h
@@ -61,7 +61,7 @@ class CClient : public QThread
     Q_OBJECT
 
 public:
-    CClient();
+    CClient ( const quint16 iPortNumber );
     virtual ~CClient() {}
 
     void   Init();
diff --git a/src/main.cpp b/src/main.cpp
index 3ecc9b8e..7d3232d4 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -142,7 +142,7 @@ int main ( int argc, char** argv )
         {
             // client
             // actual client object
-            CClient Client;
+            CClient Client ( iPortNumber );
 
             // load settings from init-file
             CSettings Settings ( &Client );
diff --git a/src/socket.h b/src/socket.h
index d0f0351b..902cd44c 100755
--- a/src/socket.h
+++ b/src/socket.h
@@ -46,8 +46,8 @@ class CSocket : public QObject
     Q_OBJECT
 
 public:
-    CSocket ( CChannel* pNewChannel ) : pChannel(  pNewChannel ), bIsClient ( true )
-        { Init(); }
+    CSocket ( CChannel* pNewChannel, const quint16 iPortNumber ) :
+        pChannel( pNewChannel ), bIsClient ( true ) { Init ( iPortNumber ); }
     CSocket ( CChannelSet* pNewChannelSet, QObject* pNServP, const quint16 iPortNumber ) :
         pChannelSet(pNewChannelSet), pServer ( pNServP ), bIsClient ( false )
         { Init ( iPortNumber ); }