diff --git a/src/invenflask/templates/checkin.html b/src/invenflask/templates/checkin.html
index 1c29c52..c73b89a 100644
--- a/src/invenflask/templates/checkin.html
+++ b/src/invenflask/templates/checkin.html
@@ -2,13 +2,18 @@
 
 {% block content %}
     <h1>{% block title %} Checkin Asset {% endblock %}</h1>
+    <script>
+        window.onload = function () {
+            document.getElementById("id").focus();
+        };
+    </script>
     <fieldset>
         <form method="POST">
             <div class="form-group">
             <label class="form-lable mt-4" for="title">ID</label>
             <br>
             <input type="text" name="id"
-                placeholder="Asset ID" 
+                placeholder="Asset ID" id="id"
                 value="{{ request.form['id'] }}"></input>
             <br>
             <button type="submit" class="btn btn-primary btn-lg">Checkin</button>
diff --git a/src/invenflask/templates/checkout.html b/src/invenflask/templates/checkout.html
index 2c9132f..4733310 100644
--- a/src/invenflask/templates/checkout.html
+++ b/src/invenflask/templates/checkout.html
@@ -46,7 +46,7 @@ <h1>{% block title %} Checkout Asset {% endblock %}</h1>
         onkeypress="return runScript1(event);"></input>
     <br>
 
-    <label for="title">Accessory</label>
+    <label for="title">Accessory (Optional)</label>
     <br>
     <input type="text" id="accessory" name="accessoryid" placeholder="Accessory ID"
         value="{{ request.form['accessoryid'] }}" autocomplete="off"></input>