diff --git a/NomadVM.sh b/NomadVM.sh
index 50f620fa890480e1442de0b35d496cac978e4e81..bb991de02c9b4cc4db22f4e13efd78f06a8da35e 100755
--- a/NomadVM.sh
+++ b/NomadVM.sh
@@ -85,9 +85,7 @@ then
 	CRASHMESSAGE=`zenity --text-info  --filename=$TEMP_FILE --editable --ok-label="Send" --title="Nomad Crash Report"`
 	if [ -n "$CRASHMESSAGE" ];
 	then
-		echo $CRASHMESSAGE > $TEMP_FILE2
-		/usr/lib/jvm/jdk10.0.1/bin/java -DvirtualHome=/tmp/nomad/nomadgui-release -Djava.library.path=lib64/common/calculator:/usr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu/jni -Djava.util.logging.config.file=conf/client/logging.properties -jar lib64/nomadmail.jar "$TEMP_FILE2"
-		rm -f $TEMP_FILE2
+		/usr/lib/jvm/jdk10.0.1/bin/java -jar lib64/nomadmail.jar "[`hostname`][report] user crash report" "$CRASHMESSAGE" sci@ill.fr $NOMAD_MAIL
 	fi
 	rm -f $TEMP_FILE
 
@@ -95,9 +93,9 @@ else
 
 	if [ $STATUS -ne 0 ];
 	then
+		content=`cat $FILE`
 		# Call the nomadmail application to send the mail of crash by the Nomad server.
-		/usr/lib/jvm/jdk10.0.1/bin/java -DvirtualHome=/tmp/nomad/nomadgui-release -Djava.library.path=lib64/common/calculator:/usr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu/jni -Djava.util.logging.config.file=conf/client/logging.properties -jar lib64/nomadmail.jar "$FILE"
-	
+		/usr/lib/jvm/jdk10.0.1/bin/java -jar lib64/nomadmail.jar "[`hostname`][client] crash" "$content" sci@ill.fr $NOMAD_MAIL
 	fi
 
 fi