diff --git a/Mystery.py b/Mystery.py
index f7b18216..e988eef4 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -18,8 +18,7 @@ from Main import get_seed, seeddigits
 from Items import item_name_groups, item_table
 
 
-
-def main():
+def mystery_argparse():
     parser = argparse.ArgumentParser(add_help=False)
     parser.add_argument('--multi', default=1, type=lambda value: min(max(int(value), 1), 255))
     multiargs, _ = parser.parse_known_args()
@@ -47,11 +46,17 @@ def main():
     for player in range(1, multiargs.multi + 1):
         parser.add_argument(f'--p{player}', help=argparse.SUPPRESS)
     args = parser.parse_args()
+    return args
+
+
+def main(args=None):
+    if not args:
+        args = mystery_argparse()
 
     seed = get_seed(args.seed)
     random.seed(seed)
 
-    seedname = "M" + (f"{get_seed()}".zfill(seeddigits))
+    seedname = "M" + (f"{random.randint(0, pow(10, seeddigits) - 1)}".zfill(seeddigits))
     print(f"Generating mystery for {args.multi} player{'s' if args.multi > 1 else ''}, {seedname} Seed {seed}")
 
     weights_cache = {}
diff --git a/WebHost/templates/tracker.html b/WebHost/templates/tracker.html
index 6a41db62..ba673c7a 100644
--- a/WebHost/templates/tracker.html
+++ b/WebHost/templates/tracker.html
@@ -65,9 +65,10 @@
                 <tr>
                     <td class="table-info">{{ loop.index }}</td>
                     {% if (team, loop.index) in video %}
-                        <td class="table-info"><a target="_blank"
-                                                  href="https://www.twitch.tv/{{ video[(team, loop.index)][1] }}">{{ player_names[(team, loop.index)] }}
-                            ▶️</a></td>
+                        <td class="table-info">
+                            <a target="_blank" href="https://www.twitch.tv/{{ video[(team, loop.index)][1] }}">
+                                {{ player_names[(team, loop.index)] }}
+                                ▶️</a></td>
                     {% else %}
                         <td class="table-info">{{ player_names[(team, loop.index)] }}</td>{% endif %}
                     {% for id in tracking_ids %}