diff --git a/prepare-shell.sh b/prepare-shell.sh
index 3d99f94780cf03462b0a1404a9097d94b8e39b1c..247a76507cab481c44cfcd08914ef3f51a33de23 100755
--- a/prepare-shell.sh
+++ b/prepare-shell.sh
@@ -48,7 +48,8 @@ fi
 
 # generate job id and save it
 # TODO this should be done on-demand
-DEFAULT_JOB_ID="${SUB_PROJECT_NAME}_${USER}_${MODEL_NAME}_$(date +%Y%m%d_%H%M%S)"
+DEFAULT_JOB_ID="${SUB_PROJECT_NAME}_${USER}_${MODEL_NAME}${DATASET_SUFFIX}_$(date +%Y%m%d_%H%M%S)"
+DEFAULT_JOB_ID="${DEFAULT_JOB_ID//-/_}"
 
 JOB_ID_FILE='.job-id'
 if [ -f "$JOB_ID_FILE" ]; then