diff --git a/physics/templates/physics/exam_start.html b/physics/templates/physics/exam_start.html
index 93b6e457..6cc35c08 100755
--- a/physics/templates/physics/exam_start.html
+++ b/physics/templates/physics/exam_start.html
@@ -2,11 +2,11 @@
 
 {% block content %}
 
-<h2>Start exam: {{exam.name}}</h2>
+    <h2>Start exam: {{exam.name}}</h2>
 
-Enter your CID and passcode in the below boxes.<br />
-<p><input id="cid-box" type="text" value="Candidate ID"></p>
-<p><input id="passcode-box" type="text" value="Passcode"></p>
+    Enter your CID and passcode in the below boxes.<br />
+    <p><input id="cid-box" type="text" value="Candidate ID"></p>
+    <p><input id="passcode-box" type="text" value="Passcode"></p>
 
     <button>Start exam</button>
 
@@ -32,4 +32,4 @@ Enter your CID and passcode in the below boxes.<br />
             });
         });
     </script>
-    {% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/sbas/templates/sbas/exam_finish.html b/sbas/templates/sbas/exam_finish.html
index 05754c4d..9f2e72bf 100644
--- a/sbas/templates/sbas/exam_finish.html
+++ b/sbas/templates/sbas/exam_finish.html
@@ -9,7 +9,7 @@ CID: {{cid}}
 {{answer_count}} out of {{exam_length}} questions answered. Click to go to question.
 <div class="sba-finish-list">
 {% for question, answer in question_answer_tuples %}
-    <a href="{% url 'sbas:exam_take' pk=exam.id sk=forloop.counter0 cid=cid %}"><button {% if not answer %}class="unanswered"{% endif %}>{{forloop.counter}}: {{answer.answer}}</button></a>
+    <a href="{% url 'sbas:exam_take' pk=exam.id sk=forloop.counter0 cid=cid passcode=passcode %}"><button {% if not answer %}class="unanswered"{% endif %}>{{forloop.counter}}: {{answer.answer}}</button></a>
 {% endfor %}
 </div>
 
diff --git a/sbas/templates/sbas/exam_overview.html b/sbas/templates/sbas/exam_overview.html
index e9903be4..4bcd0a4d 100644
--- a/sbas/templates/sbas/exam_overview.html
+++ b/sbas/templates/sbas/exam_overview.html
@@ -28,7 +28,6 @@
                 {% if exam.publish_results %}checked{% endif %}> <span class="help-text">[When checked the exam results will
                     be available on this site]</span>
         </div>
-        <!--<p><button><a href="{% url 'anatomy:exam_take' pk=exam.pk sk=0 %}">Click here to start</a></button></p>-->
         This exam will be available to take <a href="{% url 'sbas:exam_start' pk=exam.pk %}">here</a> (when active).
 
         {% autoescape off %}
diff --git a/sbas/templates/sbas/exam_scores_user.html b/sbas/templates/sbas/exam_scores_user.html
index 5fb05f33..1dc39ed9 100644
--- a/sbas/templates/sbas/exam_scores_user.html
+++ b/sbas/templates/sbas/exam_scores_user.html
@@ -7,7 +7,7 @@
     Answers:
     <ul>
         {% for question, a, score, correct_answer in answers_and_marks %}
-        <li class="user-answer-li"><a href="{% url 'sbas:exam_take' exam.pk forloop.counter0 cid %}">Question
+        <li class="user-answer-li"><a href="{% url 'sbas:exam_take' exam.pk forloop.counter0 cid passcode %}">Question
                 {{forloop.counter}}</a> - {{ question.stem |safe}}</li>
         <span>Correct answer: {{correct_answer|safe}} <br />{{a}} <span class="answer-{{score}}">(Score:
                 {{score}})</span></span>
diff --git a/sbas/templates/sbas/exam_start.html b/sbas/templates/sbas/exam_start.html
index 53b5ec9e..9188ba14 100755
--- a/sbas/templates/sbas/exam_start.html
+++ b/sbas/templates/sbas/exam_start.html
@@ -2,24 +2,34 @@
 
 {% block content %}
 
-<h2>{{exam.name}}</h2>
+    <h2>Start exam: {{exam.name}}</h2>
 
-Enter your CID in the below box.<br />
-<input id="cid-box" type="text" value="Candidate ID">
- 
-<button>Start exam</button>
+    Enter your CID and passcode in the below boxes.<br />
+    <p><input id="cid-box" type="text" value="Candidate ID"></p>
+    <p><input id="passcode-box" type="text" value="Passcode"></p>
 
-<script type="text/javascript">
-    $(document).ready(function () {
-        $("button").click(() => {
-        let cid = $("#cid-box").val();
+    <button>Start exam</button>
 
-        if (Number.isInteger(parseInt(cid))) {
-        window.location.replace("{% url 'sbas:exam_take' pk=exam.pk sk=0 cid='0000000' %}".replace("0000000", cid));
-        } else {
-            alert("Please enter a valid Candidate ID (CID).")
-        }
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#cid-box, #passcode-box").keypress(function(e) {
+                // Enter pressed?
+                console.log(e)
+                if(e.which == 10 || e.which == 13) {
+                    $("button").click();
+                }
+            });
+
+            $("button").click(() => {
+                let cid = $("#cid-box").val();
+                let passcode = $("#passcode-box").val();
+
+                if (Number.isInteger(parseInt(cid))) {
+                    window.location.replace("{% url 'sbas:exam_take' pk=exam.pk sk=0 cid='0000000' passcode='ZZZZZZ' %}".replace("0000000", cid).replace("ZZZZZZ", passcode));
+                } else {
+                    alert("Please enter a valid Candidate ID (CID).")
+                }
+            });
         });
-    });
-</script>
-{% endblock %}
+    </script>
+{% endblock %}
\ No newline at end of file