diff --git a/basic.html b/basic.html
index 062fb07..0e8c75e 100644
--- a/basic.html
+++ b/basic.html
@@ -7,7 +7,7 @@
 <body>
   <h1>Form Autofill Demo Page</h1>
   <form id="form">
-    <p><label>organization: <input type="text" id="organization" name="organization"  autocomplete="organization"></label></p>
+    <p><label>organization: <input type="text" id="organization" name="organization"  autocomplete="organization" autofocus></label></p>
     <p><label>streetAddress: <input type="text" id="street-address" name="street-address" autocomplete="street-address"></label></p>
     <p><label>addressLevel2: <input type="text" id="address-level2" name="address-level2" autocomplete="address-level2"></label></p>
     <p><label>addressLevel1: <input type="text" id="address-level1" name="address-level1" autocomplete="address-level1"></label></p>
@@ -22,8 +22,8 @@
   <p><button id="btn">Add new input</button></p>
 
   <form>
-    <p><input type="text" name="username"></p>
-    <p><input type="password" name="password"></p>
+    <p><input type="text" id="username" name="username"></p>
+    <p><input type="password" id="password" name="password"></p>
     <p><input type="submit"></p>
   </form>
 
