diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index fef17389..b897c2d9 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -18,7 +18,7 @@ from aurweb.packages.search import PackageSearch
 from aurweb.packages.util import get_pkg_or_base, get_pkgbase_comment, query_notified, query_voted
 from aurweb.scripts import notify, popupdate
 from aurweb.scripts.rendercomment import update_comment_render
-from aurweb.templates import make_context, render_raw_template, render_template
+from aurweb.templates import make_context, make_variable_context, render_raw_template, render_template
 
 router = APIRouter()
 
@@ -636,7 +636,7 @@ async def requests(request: Request,
 @router.get("/pkgbase/{name}/request")
 @auth_required(True, redirect="/pkgbase/{name}")
 async def package_request(request: Request, name: str):
-    context = make_context(request, "Submit Request")
+    context = await make_variable_context(request, "Submit Request")
 
     pkgbase = db.query(models.PackageBase).filter(
         models.PackageBase.Name == name).first()
@@ -657,7 +657,7 @@ async def pkgbase_request_post(request: Request, name: str,
     pkgbase = get_pkg_or_base(name, models.PackageBase)
 
     # Create our render context.
-    context = make_context(request, "Submit Request")
+    context = await make_variable_context(request, "Submit Request")
     context["pkgbase"] = pkgbase
     if type not in {"deletion", "merge", "orphan"}:
         # In the case that someone crafted a POST request with an invalid
diff --git a/templates/pkgbase/request.html b/templates/pkgbase/request.html
index bb9b5aba..79d47ce4 100644
--- a/templates/pkgbase/request.html
+++ b/templates/pkgbase/request.html
@@ -30,9 +30,21 @@
                 <p>
                     <label for="id_type">{{ "Request type" | tr }}:</label>
                     <select id="id_type" name="type">
-                        <option value="deletion">{{ "Deletion" | tr }}</option>
-                        <option value="merge">{{ "Merge" | tr }}</option>
-                        <option value="orphan">{{ "Orphan" | tr }}</option>
+                        <option value="deletion"
+                            {% if type == "deletion" %}
+                                selected
+                            {% endif %}
+                        >{{ "Deletion" | tr }}</option>
+                        <option value="merge"
+                            {% if type == "merge" %}
+                                selected
+                            {% endif %}
+                        >{{ "Merge" | tr }}</option>
+                        <option value="orphan"
+                            {% if type == "orphan" %}
+                                selected
+                            {% endif %}
+                        >{{ "Orphan" | tr }}</option>
                     </select>
                 </p>
 
@@ -44,13 +56,13 @@
                 <p id="merge_section" style="display: none">
                     <label for="id_merge_into">{{ "Merge into" | tr }}:</label>
                     <input id="id_merge_into" type="text" name="merge_into"
-                           autocomplete="off" />
+                           autocomplete="off" value="{{ merge_into or '' }}" />
                 </p>
 
                 <p>
                     <label for="id_comments">{{ "Comments" | tr }}:</label>
                     <textarea id="id_comments" name="comments"
-                              rows="5" cols="50"></textarea>
+                              rows="5" cols="50">{{ comments or '' }}</textarea>
                 </p>
 
                 <p id="deletion_hint">