--- a/plugins/SpecialUserFuncs.php	Thu Jun 28 15:26:40 2007 -0400
+++ b/plugins/SpecialUserFuncs.php	Sun Jul 01 14:08:39 2007 -0400
@@ -167,6 +167,10 @@
               {
                 echo 'tabindex="1" ';
               }
+              else
+              {
+                echo 'tabindex="3" ';
+              }
               if ( $session->user_logged_in )
               {
                 echo 'value="' . $session->username . '"';
@@ -192,7 +196,7 @@
          </tr>
          <?php } ?>
          <tr>
-           <th colspan="3" style="text-align: center" class="subhead"><input type="submit" name="login" value="Log in" tabindex="3" /></th>
+           <th colspan="3" style="text-align: center" class="subhead"><input type="submit" name="login" value="Log in" tabindex="<?php echo ( $level <= USER_LEVEL_MEMBER ) ? '3' : '2'; ?>" /></th>
          </tr>
       </table>
     </div>
@@ -201,6 +205,15 @@
       <input type="hidden" name="crypt_key" value="<?php echo $pubkey; ?>" />
       <input type="hidden" name="crypt_data" value="" />
       <input type="hidden" name="auth_level" value="<?php echo (string)$level; ?>" />
+      <?php if ( $level <= USER_LEVEL_MEMBER ): ?>
+      <script type="text/javascript">
+        document.forms.loginform.username.focus();
+      </script>
+      <?php else: ?>
+      <script type="text/javascript">
+        document.forms.loginform.pass.focus();
+      </script>
+      <?php endif; ?>
     </form>
     <?php
       echo $session->aes_javascript('loginform', 'pass', 'use_crypt', 'crypt_key', 'crypt_data', 'challenge_data');