diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
index 03fa799ad..ad6b6f152 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
@@ -140,14 +140,15 @@ public class AdminSchedulerAction extends FessAdminAction {
                 final String decodedName = new String(Base64.getUrlDecoder().decode(name), Constants.CHARSET_UTF_8);
                 scheduledJobForm.name = MessageFormat.format(fessConfig.getJobTemplateTitle(type), decodedName);
                 final String[] ids = new String[] { "", "", "" };
+                final String configId = id.replace('-', '_');
                 if (Constants.WEB_CRAWLER_TYPE.equals(type)) {
-                    ids[0] = "\"" + id + "\"";
+                    ids[0] = "\"" + configId + "\"";
                 } else if (Constants.FILE_CRAWLER_TYPE.equals(type)) {
-                    ids[1] = "\"" + id + "\"";
+                    ids[1] = "\"" + configId + "\"";
                 } else if (Constants.DATA_CRAWLER_TYPE.equals(type)) {
-                    ids[2] = "\"" + id + "\"";
+                    ids[2] = "\"" + configId + "\"";
                 }
-                scheduledJobForm.scriptData = MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], id);
+                scheduledJobForm.scriptData = MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], configId);
             });
         });
     }
diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java
index 8a40a260c..710eac7dc 100644
--- a/src/main/java/org/codelibs/fess/exec/Crawler.java
+++ b/src/main/java/org/codelibs/fess/exec/Crawler.java
@@ -307,6 +307,8 @@ public class Crawler {
             // use a default session id
             final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
             options.sessionId = sdf.format(new Date());
+        } else {
+            options.sessionId = options.sessionId.replace('-', '_');
         }
 
         final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper();