diff --git a/scripts/codesonar-exec.sh b/scripts/codesonar-exec.sh
index bd1776c6b90354d035a4a65993b87a6eeba9634d..c47308ca548b6454b2e622e0246e3f1669248e69 100644
--- a/scripts/codesonar-exec.sh
+++ b/scripts/codesonar-exec.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
   
-
-echo "Starting hub in /home/codesonar/hub"
-echo -e "$1\n$1\n" | /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
-echo "Hub password is $1"
+  
+if test -f "/home/codesonar/hub/hubpwd"; then
+   echo "Starting hub in /home/codesonar/hub with existing pwd"
+   /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
+else
+   HUB_DEFAULT_PWD=$(date +%s | base64 | head -c 32)
+   echo "${HUB_DEFAULT_PWD}" > /home/codesonar/hub/hubpwd
+   chmod 600 /home/codesonar/hub/hubpwd
+   echo "Starting hub with new hub password: ${HUB_DEFAULT_PWD}"
+   echo -e "${HUB_DEFAULT_PWD}\n${HUB_DEFAULT_PWD}\n" |  /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
+fi
 
 echo "Hub started..."
 while [ 1 ]