diff --git a/tpl/addlink.html b/tpl/addlink.html
index 941de08..375afba 100644
--- a/tpl/addlink.html
+++ b/tpl/addlink.html
@@ -3,12 +3,12 @@
   <head>
     {include="includes"}
   </head>
-  <body onload="document.addform.post.focus();">
+  <body>
     <div id="pageheader">
       {include="page.header"}
       <div id="headerform">
         <form method="GET" action="" name="addform" class="addform">
-          <input type="text" name="post">
+          <input type="text" name="post" autofocus>
           <input type="submit" value="Add link" class="bigbutton">
         </form>
       </div>
diff --git a/tpl/changepassword.html b/tpl/changepassword.html
index 8bec578..d0cd51d 100644
--- a/tpl/changepassword.html
+++ b/tpl/changepassword.html
@@ -3,13 +3,13 @@
   <head>
     {include="includes"}
   </head>
-  <body onload="document.changepasswordform.oldpassword.focus();">
+  <body>
     <div id="pageheader">
       {include="page.header"}
       <form method="POST" action="" name="changepasswordform" id="changepasswordform">
         <p>
           <label for="oldpassword">Old password:</label>
-          <input type="password" name="oldpassword" id="oldpassword" />
+          <input type="password" name="oldpassword" id="oldpassword" autofocus/>
         </p>
         <p>
           <label for="setpassword">New password:</label>
