diff --git a/scripts/start-client.sh b/scripts/start-client.sh
index c155ee3a..6b2b92ee 100755
--- a/scripts/start-client.sh
+++ b/scripts/start-client.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 
+# Usage: start-client.sh [server] [username]
+
 SCRIPTPATH=$( cd $(dirname $0) ; pwd -P )
 MODE=debug
-USERNAME=${1:-client}
+SERVER=${1:-localhost}
+USERNAME=${2:-client}
 
 shift
 
-${SCRIPTPATH}/../build/${MODE}/bin/freelan -f -d --client.enabled=yes --client.disable_peer_verification=yes --client.disable_host_verification=yes --fscp.listen_on=0.0.0.0:12001 --client.username=${USERNAME} --client.password="ok" --client.public_endpoint=0.0.0.0 --client.public_endpoint=:: --client.public_endpoint=localhost:12001 $@
+${SCRIPTPATH}/../build/${MODE}/bin/freelan -f -d --client.enabled=yes --client.disable_peer_verification=yes --client.disable_host_verification=yes --fscp.listen_on=0.0.0.0:12001 --client.username=${USERNAME} --client.password="ok" --client.public_endpoint=0.0.0.0 --client.public_endpoint=:: --client.server_endpoint=${SERVER} $@
diff --git a/scripts/start-server.sh b/scripts/start-server.sh
index 56337d58..b5caa544 100755
--- a/scripts/start-server.sh
+++ b/scripts/start-server.sh
@@ -3,4 +3,4 @@
 SCRIPTPATH=$( cd $(dirname $0) ; pwd -P )
 MODE=debug
 
-${SCRIPTPATH}/../build/${MODE}/bin/freelan -f -d --server.enabled=yes --server.authentication_script=${SCRIPTPATH}/scripts/authenticate.sh $@
+${SCRIPTPATH}/../build/${MODE}/bin/freelan -f -d --server.enabled=yes --server.authentication_script=${SCRIPTPATH}/authenticate.sh $@