diff --git a/templates/cid_selector.html b/templates/cid_selector.html
index 07fc8bfa..478b3345 100644
--- a/templates/cid_selector.html
+++ b/templates/cid_selector.html
@@ -4,14 +4,25 @@
 <div class="">
     <h2>Exam / Results checker</h2>
     <p>Please enter your CID and passcode</p>
-    <p>CID: <input type="text" name="cid" id="cid-input"></p>
+    <p>CID: <input type="text" name="cid" id="cid-box"></p>
     <p>Passcode: <input id="passcode-box" type="text" value="Passcode"></p>
     <button id="cid-selector-go-button">Go...</button>
 </div>
 <script>
     $(document).ready(function () {
+        window.location.search.substr(1).split("&").forEach((item) =>
+            {
+                s = item.split("=");
+                if (s[0] == "cid") {
+                    $("#cid-box").val(s[1]);
 
-        $("#cid-input, #passcode-box").keypress(function(e) {
+                }
+                if (s[0] == "passcode") {
+                    $("#passcode-box").val(s[1]);
+                }
+            });
+
+        $("#cid-box, #passcode-box").keypress(function(e) {
             // Enter pressed?
             console.log(e)
             if(e.which == 10 || e.which == 13) {