diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 6a795fe51..eb135bfcb 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -7,45 +7,45 @@ $parent_file = 'options-general.php';
 function add_js() {
 ?>
 <script type="text/javascript">
-    //<![CDATA[
-		function GetElementsWithClassName(elementName, className) {
-		   var allElements = document.getElementsByTagName(elementName);
-		   var elemColl = new Array();
-		   for (i = 0; i < allElements.length; i++) {
-		       if (allElements[i].className == className) {
-		           elemColl[elemColl.length] = allElements[i];
-		       }
-		   }
-		   return elemColl;
-		}
-		
-		function upit() {
-		   var inputColl = GetElementsWithClassName('input', 'tog');
-		   var structure = document.getElementById('permalink_structure');
-		   var inputs = '';
-		   for (i = 0; i < inputColl.length; i++) {
-		       if ( inputColl[i].checked && inputColl[i].value != '') {
-					inputs += inputColl[i].value + ' ';
-		            }
-		       }
-		   inputs = inputs.substr(0,inputs.length - 1);
-			if ( 'custom' != inputs )
-			   structure.value = inputs;
-		   }
-		
-		function blurry() {
-		   if (!document.getElementById) return;
-		
-		   var aInputs = document.getElementsByTagName('input');
-		
-		   for (var i = 0; i < aInputs.length; i++) {		
-		       aInputs[i].onclick = aInputs[i].onkeyup = upit;
-		   }
-		}
-		
-		window.onload = blurry;
-    //]]>
-    </script>
+//<![CDATA[
+function GetElementsWithClassName(elementName, className) {
+var allElements = document.getElementsByTagName(elementName);
+var elemColl = new Array();
+for (i = 0; i < allElements.length; i++) {
+if (allElements[i].className == className) {
+elemColl[elemColl.length] = allElements[i];
+}
+}
+return elemColl;
+}
+
+function upit() {
+var inputColl = GetElementsWithClassName('input', 'tog');
+var structure = document.getElementById('permalink_structure');
+var inputs = '';
+for (i = 0; i < inputColl.length; i++) {
+if ( inputColl[i].checked && inputColl[i].value != '') {
+inputs += inputColl[i].value + ' ';
+}
+}
+inputs = inputs.substr(0,inputs.length - 1);
+if ( 'custom' != inputs )
+structure.value = inputs;
+}
+
+function blurry() {
+if (!document.getElementById) return;
+
+var aInputs = document.getElementsByTagName('input');
+
+for (var i = 0; i < aInputs.length; i++) {		
+aInputs[i].onclick = aInputs[i].onkeyup = upit;
+}
+}
+
+window.onload = blurry;
+//]]>
+</script>
 <?php
 }
 add_filter('admin_head', 'add_js');
diff --git a/wp-login.php b/wp-login.php
index a68f23945..6d30e826e 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -228,10 +228,10 @@ if ( $error )
 <p><label><?php _e('Username:') ?><br /><input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label></p>
 <p><label><?php _e('Password:') ?><br /> <input type="password" name="pwd" id="pwd" value="" size="20" tabindex="2" /></label></p>
 <p>
-  <label><input name="rememberme" type="checkbox" id="rememberme" value="forever" /> 
+  <label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" /> 
   <?php _e('Remember me'); ?></label></p>
 <p class="submit">
-	<input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="3" />
+	<input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="4" />
 	<input type="hidden" name="redirect_to" value="<?php echo $redirect_to; ?>" />
 </p>
 </form>