diff --git a/packages/migrate/index.ts b/packages/migrate/index.ts
index 7f8912ac9..02bf5ff51 100644
--- a/packages/migrate/index.ts
+++ b/packages/migrate/index.ts
@@ -31,6 +31,7 @@ export function apply(ctx: Context) {
             password: Schema.string().required(),
             domainId: Schema.string().default('system'),
             dataDir: Schema.string().default('/opt/syzoj/web/uploads'),
+            randomMail: Schema.union(['never', 'needed', 'always']).default('never'),
         }),
         (...args) => require('./scripts/syzoj').run(...args),
     );
diff --git a/packages/migrate/scripts/syzoj.ts b/packages/migrate/scripts/syzoj.ts
index 7d016a6cf..ddc163f81 100644
--- a/packages/migrate/scripts/syzoj.ts
+++ b/packages/migrate/scripts/syzoj.ts
@@ -74,7 +74,7 @@ const langMap = {
 export async function run({
     host = 'localhost', port = 3306, name = 'syzoj',
     username, password, domainId, dataDir,
-    rerun = true, randomMail = false,
+    rerun = true, randomMail = 'never',
 }, report: Function) {
     const src = await mariadb.createConnection({
         host,
@@ -114,9 +114,13 @@ export async function run({
     const precheck = await UserModel.getMulti({ unameLower: { $in: udocs.map((u) => u.username.toLowerCase()) } }).toArray();
     if (precheck.length) throw new Error(`Conflict username: ${precheck.map((u) => u.unameLower).join(', ')}`);
     for (const udoc of udocs) {
-        if (randomMail) delete udoc.email;
+        if (randomMail === 'always') delete udoc.email;
         let current = await UserModel.getByEmail(domainId, udoc.email || `${udoc.username}@syzoj.local`);
         current ||= await UserModel.getByUname(domainId, udoc.username);
+        if (current && randomMail === 'needed') {
+            delete udoc.email;
+            current = await UserModel.getByEmail(domainId, udoc.email || `${udoc.username}@syzoj.local`);
+        }
         if (current) {
             report({ message: `duplicate user with email ${udoc.email}: ${current.uname},${udoc.username}` });
             uidMap[udoc.id] = current._id;
diff --git a/packages/ui-default/templates/record_detail_summary.html b/packages/ui-default/templates/record_detail_summary.html
index bf995f286..98e216ea0 100644
--- a/packages/ui-default/templates/record_detail_summary.html
+++ b/packages/ui-default/templates/record_detail_summary.html
@@ -7,6 +7,8 @@
   {% if rdoc['time'] %}
     <dt>{{ _('Total Time') }}</dt>
     <dd>{% if _ge %}&ge;{% endif %}{{ rdoc.time|round(0) }}ms</dd>
+  {% endif %}
+  {% if rdoc.testCases.length %}
     <dt>{{ _('Peak Time') }}</dt>
     <dd>{% if _ge %}&ge;{% endif %}{{ (rdoc.testCases|sort(true, true, "time")|first)["time"]|round(0) }}ms</dd>
   {% endif %}