Index: src/bbpress.php
===================================================================
--- src/bbpress.php	(revision 5555)
+++ src/bbpress.php	(working copy)
@@ -276,7 +276,6 @@
 		$this->domain         = 'bbpress';      // Unique identifier for retrieving translated strings
 		$this->extend         = new stdClass(); // Plugins add data here
 		$this->errors         = new WP_Error(); // Feedback
-		$this->tab_index      = apply_filters( 'bbp_default_tab_index', 100 );
 	}
 
 	/**
Index: src/includes/admin/metaboxes.php
===================================================================
--- src/includes/admin/metaboxes.php	(revision 5555)
+++ src/includes/admin/metaboxes.php	(working copy)
@@ -355,7 +355,6 @@
 
 			// Output-related
 			'select_id'          => 'parent_id',
-			'tab'                => bbp_get_tab_index(),
 			'options_only'       => false,
 			'show_none'          => __( '— No parent —', 'bbpress' ),
 			'disable_categories' => false,
@@ -437,7 +436,6 @@
 
 			// Output-related
 			'select_id'          => 'parent_id',
-			'tab'                => bbp_get_tab_index(),
 			'options_only'       => false,
 			'show_none'          => __( '— No parent —', 'bbpress' ),
 			'disable_categories' => current_user_can( 'edit_forums' ),
@@ -507,7 +505,6 @@
 
 				// Output-related
 				'select_id'          => 'bbp_forum_id',
-				'tab'                => bbp_get_tab_index(),
 				'options_only'       => false,
 				'show_none'          => __( '— No parent —', 'bbpress' ),
 				'disable_categories' => current_user_can( 'edit_forums' ),
Index: src/includes/common/template.php
===================================================================
--- src/includes/common/template.php	(revision 5555)
+++ src/includes/common/template.php	(working copy)
@@ -1313,46 +1313,6 @@
 	}
 
 /**
- * Output the current tab index of a given form
- *
- * Use this function to handle the tab indexing of user facing forms within a
- * template file. Calling this function will automatically increment the global
- * tab index by default.
- *
- * @since bbPress (r2810)
- *
- * @param int $auto_increment Optional. Default true. Set to false to prevent
- *                             increment
- */
-function bbp_tab_index( $auto_increment = true ) {
-	echo bbp_get_tab_index( $auto_increment );
-}
-
-	/**
-	 * Return the current tab index of a given form
-	 *
-	 * Use this function to handle the tab indexing of user facing forms
-	 * within a template file. Calling this function will automatically
-	 * increment the global tab index by default.
-	 *
-	 * @since bbPress (r2810)
-	 *
-	 * @uses apply_filters Allows return value to be filtered
-	 * @param int $auto_increment Optional. Default true. Set to false to
-	 *                             prevent the increment
-	 * @return int $bbp->tab_index The global tab index
-	 */
-	function bbp_get_tab_index( $auto_increment = true ) {
-		$bbp = bbpress();
-
-		if ( true === $auto_increment ) {
-			++$bbp->tab_index;
-		}
-
-		return apply_filters( 'bbp_get_tab_index', (int) $bbp->tab_index );
-	}
-
-/**
  * Output a select box allowing to pick which forum/topic a new topic/reply
  * belongs in.
  *
@@ -1388,7 +1348,6 @@
 	 *  - walker: Which walker to use? Defaults to
 	 *             {@link BBP_Walker_Dropdown}
 	 *  - select_id: ID of the select box. Defaults to 'bbp_forum_id'
-	 *  - tab: Tabindex value. False or integer
 	 *  - options_only: Show only <options>? No <select>?
 	 *  - show_none: Boolean or String __( '(No Forum)', 'bbpress' )
 	 *  - disable_categories: Disable forum categories and closed forums?
@@ -1428,7 +1387,6 @@
 
 			// Output-related
 			'select_id'          => 'bbp_forum_id',
-			'tab'                => bbp_get_tab_index(),
 			'options_only'       => false,
 			'show_none'          => false,
 			'disable_categories' => true,
@@ -1477,11 +1435,8 @@
 			// Should this select appear disabled?
 			$disabled  = disabled( isset( bbpress()->options[ $r['disabled'] ] ), true, false );
 
-			// Setup the tab index attribute
-			$tab       = !empty( $r['tab'] ) ? ' tabindex="' . intval( $r['tab'] ) . '"' : '';
-
 			// Open the select tag
-			$retval   .= '<select name="' . esc_attr( $r['select_id'] ) . '" id="' . esc_attr( $r['select_id'] ) . '"' . $disabled . $tab . '>' . "\n";
+			$retval   .= '<select name="' . esc_attr( $r['select_id'] ) . '" id="' . esc_attr( $r['select_id'] ) . '"' . $disabled . '>' . "\n";
 		}
 
 		// Display a leading 'no-value' option, with or without custom text
@@ -1773,7 +1728,6 @@
 			'wpautop'           => true,
 			'media_buttons'     => false,
 			'textarea_rows'     => '12',
-			'tabindex'          => bbp_get_tab_index(),
 			'tabfocus_elements' => 'bbp_topic_title,bbp_topic_tags',
 			'editor_class'      => 'bbp-the-content',
 			'tinymce'           => false,
@@ -1814,7 +1768,6 @@
 				'wpautop'           => $r['wpautop'],
 				'media_buttons'     => $r['media_buttons'],
 				'textarea_rows'     => $r['textarea_rows'],
-				'tabindex'          => $r['tabindex'],
 				'tabfocus_elements' => $r['tabfocus_elements'],
 				'editor_class'      => $r['editor_class'],
 				'tinymce'           => $r['tinymce'],
@@ -1837,7 +1790,7 @@
 		 */
 		else : ?>
 
-			<textarea id="bbp_<?php echo esc_attr( $r['context'] ); ?>_content" class="<?php echo esc_attr( $r['editor_class'] ); ?>" name="bbp_<?php echo esc_attr( $r['context'] ); ?>_content" cols="60" rows="<?php echo esc_attr( $r['textarea_rows'] ); ?>" tabindex="<?php echo esc_attr( $r['tabindex'] ); ?>"><?php echo $post_content; ?></textarea>
+			<textarea id="bbp_<?php echo esc_attr( $r['context'] ); ?>_content" class="<?php echo esc_attr( $r['editor_class'] ); ?>" name="bbp_<?php echo esc_attr( $r['context'] ); ?>_content" cols="60" rows="<?php echo esc_attr( $r['textarea_rows'] ); ?>"><?php echo $post_content; ?></textarea>
 
 		<?php endif;
 
Index: src/includes/common/widgets.php
===================================================================
--- src/includes/common/widgets.php	(revision 5555)
+++ src/includes/common/widgets.php	(working copy)
@@ -90,16 +90,16 @@
 
 					<div class="bbp-username">
 						<label for="user_login"><?php _e( 'Username', 'bbpress' ); ?>: </label>
-						<input type="text" name="log" value="<?php bbp_sanitize_val( 'user_login', 'text' ); ?>" size="20" id="user_login" tabindex="<?php bbp_tab_index(); ?>" />
+						<input type="text" name="log" value="<?php bbp_sanitize_val( 'user_login', 'text' ); ?>" size="20" id="user_login" />
 					</div>
 
 					<div class="bbp-password">
 						<label for="user_pass"><?php _e( 'Password', 'bbpress' ); ?>: </label>
-						<input type="password" name="pwd" value="<?php bbp_sanitize_val( 'user_pass', 'password' ); ?>" size="20" id="user_pass" tabindex="<?php bbp_tab_index(); ?>" />
+						<input type="password" name="pwd" value="<?php bbp_sanitize_val( 'user_pass', 'password' ); ?>" size="20" id="user_pass" />
 					</div>
 
 					<div class="bbp-remember-me">
-						<input type="checkbox" name="rememberme" value="forever" <?php checked( bbp_get_sanitize_val( 'rememberme', 'checkbox' ), true, true ); ?> id="rememberme" tabindex="<?php bbp_tab_index(); ?>" />
+						<input type="checkbox" name="rememberme" value="forever" <?php checked( bbp_get_sanitize_val( 'rememberme', 'checkbox' ), true, true ); ?> id="rememberme" />
 						<label for="rememberme"><?php _e( 'Remember Me', 'bbpress' ); ?></label>
 					</div>
 
@@ -107,7 +107,7 @@
 
 						<?php do_action( 'login_form' ); ?>
 
-						<button type="submit" name="user-submit" id="user-submit" tabindex="<?php bbp_tab_index(); ?>" class="button submit user-submit"><?php _e( 'Log In', 'bbpress' ); ?></button>
+						<button type="submit" name="user-submit" id="user-submit" class="button submit user-submit"><?php _e( 'Log In', 'bbpress' ); ?></button>
 
 						<?php bbp_user_login_fields(); ?>
 
Index: src/includes/forums/template.php
===================================================================
--- src/includes/forums/template.php	(revision 5555)
+++ src/includes/forums/template.php	(working copy)
@@ -2419,7 +2419,6 @@
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_forum_type
- *  - tab: Tabindex
  *  - forum_id: Forum id
  *  - selected: Override the selected option
  * @uses bbp_get_form_forum_type() To get the topic's forum id
@@ -2434,7 +2433,6 @@
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_forum_type
-	 *  - tab: Tabindex
 	 *  - forum_id: Forum id
 	 *  - selected: Override the selected option
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
@@ -2455,7 +2453,6 @@
 		// Parse arguments against default values
 		$r = bbp_parse_args( $args, array(
 			'select_id'    => 'bbp_forum_type',
-			'tab'          => bbp_get_tab_index(),
 			'forum_id'     => $forum_id,
 			'selected'     => false
 		), 'forum_type_select' );
@@ -2482,13 +2479,10 @@
 			}
 		}
 
-		// Used variables
-		$tab = ! empty( $r['tab'] ) ? ' tabindex="' . (int) $r['tab'] . '"' : '';
-
 		// Start an output buffer, we'll finish it after the select loop
 		ob_start(); ?>
 
-		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ) ?>_select"<?php echo $tab; ?>>
+		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ) ?>_select">
 
 			<?php foreach ( bbp_get_forum_types() as $key => $label ) : ?>
 
@@ -2511,7 +2505,6 @@
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_forum_status
- *  - tab: Tabindex
  *  - forum_id: Forum id
  *  - selected: Override the selected option
  * @uses bbp_get_form_forum_status() To get the topic's forum id
@@ -2526,7 +2519,6 @@
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_forum_status
-	 *  - tab: Tabindex
 	 *  - forum_id: Forum id
 	 *  - selected: Override the selected option
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
@@ -2547,7 +2539,6 @@
 		// Parse arguments against default values
 		$r = bbp_parse_args( $args, array(
 			'select_id'    => 'bbp_forum_status',
-			'tab'          => bbp_get_tab_index(),
 			'forum_id'     => $forum_id,
 			'selected'     => false
 		), 'forum_status_select' );
@@ -2574,13 +2565,10 @@
 			}
 		}
 
-		// Used variables
-		$tab = ! empty( $r['tab'] ) ? ' tabindex="' . (int) $r['tab'] . '"' : '';
-
 		// Start an output buffer, we'll finish it after the select loop
 		ob_start(); ?>
 
-		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ) ?>_select"<?php echo $tab; ?>>
+		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ) ?>_select">
 
 			<?php foreach ( bbp_get_forum_statuses() as $key => $label ) : ?>
 
@@ -2603,7 +2591,6 @@
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_forum_visibility
- *  - tab: Tabindex
  *  - forum_id: Forum id
  *  - selected: Override the selected option
  * @uses bbp_get_form_forum_visibility() To get the topic's forum id
@@ -2618,7 +2605,6 @@
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_forum_visibility
-	 *  - tab: Tabindex
 	 *  - forum_id: Forum id
 	 *  - selected: Override the selected option
 	 * @uses bbp_is_topic_edit() To check if it's the topic edit page
@@ -2639,7 +2625,6 @@
 		// Parse arguments against default values
 		$r = bbp_parse_args( $args, array(
 			'select_id'    => 'bbp_forum_visibility',
-			'tab'          => bbp_get_tab_index(),
 			'forum_id'     => $forum_id,
 			'selected'     => false
 		), 'forum_type_select' );
@@ -2666,13 +2651,10 @@
 			}
 		}
 
-		// Used variables
-		$tab = ! empty( $r['tab'] ) ? ' tabindex="' . (int) $r['tab'] . '"' : '';
-
 		// Start an output buffer, we'll finish it after the select loop
 		ob_start(); ?>
 
-		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ) ?>_select"<?php echo $tab; ?>>
+		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ) ?>_select">
 
 			<?php foreach ( bbp_get_forum_visibilities() as $key => $label ) : ?>
 
Index: src/includes/replies/template.php
===================================================================
--- src/includes/replies/template.php	(revision 5555)
+++ src/includes/replies/template.php	(working copy)
@@ -2761,7 +2761,6 @@
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_reply_status
- *  - tab: Tabindex
  *  - reply_id: Reply id
  *  - selected: Override the selected option
  */
@@ -2779,7 +2778,6 @@
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_reply_status
-	 *  - tab: Tabindex
 	 *  - reply_id: Reply id
 	 *  - selected: Override the selected option
 	 */
@@ -2788,7 +2786,6 @@
 		// Parse arguments against default values
 		$r = bbp_parse_args( $args, array(
 			'select_id' => 'bbp_reply_status',
-			'tab'       => bbp_get_tab_index(),
 			'reply_id'  => 0,
 			'selected'  => false
 		), 'reply_status_dropdown' );
@@ -2815,13 +2812,10 @@
 			}
 		}
 
-		// Used variables
-		$tab = ! empty( $r['tab'] ) ? ' tabindex="' . (int) $r['tab'] . '"' : '';
-
 		// Start an output buffer, we'll finish it after the select loop
 		ob_start(); ?>
 
-		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ); ?>_select"<?php echo $tab; ?>>
+		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ); ?>_select">
 
 			<?php foreach ( bbp_get_reply_statuses( $r['reply_id'] ) as $key => $label ) : ?>
 
Index: src/includes/topics/template.php
===================================================================
--- src/includes/topics/template.php	(revision 5555)
+++ src/includes/topics/template.php	(working copy)
@@ -3213,7 +3213,6 @@
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_stick_topic
- *  - tab: Tabindex
  *  - topic_id: Topic id
  *  - selected: Override the selected option
  */
@@ -3228,7 +3227,6 @@
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_stick_topic
- *  - tab: Tabindex
  *  - topic_id: Topic id
  *  - selected: Override the selected option
  */
@@ -3242,7 +3240,6 @@
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_stick_topic
-	 *  - tab: Tabindex
 	 *  - topic_id: Topic id
 	 *  - selected: Override the selected option
 	 * @uses bbp_get_topic_id() To get the topic id
@@ -3256,7 +3253,6 @@
 		// Parse arguments against default values
 		$r = bbp_parse_args( $args, array(
 			'select_id'    => 'bbp_stick_topic',
-			'tab'          => bbp_get_tab_index(),
 			'topic_id'     => 0,
 			'selected'     => false
 		), 'topic_type_select' );
@@ -3289,13 +3285,10 @@
 			}
 		}
 
-		// Used variables
-		$tab = ! empty( $r['tab'] ) ? ' tabindex="' . (int) $r['tab'] . '"' : '';
-
 		// Start an output buffer, we'll finish it after the select loop
 		ob_start(); ?>
 
-		<select name="<?php echo esc_attr( $r['select_id'] ); ?>" id="<?php echo esc_attr( $r['select_id'] ); ?>_select"<?php echo $tab; ?>>
+		<select name="<?php echo esc_attr( $r['select_id'] ); ?>" id="<?php echo esc_attr( $r['select_id'] ); ?>_select">
 
 			<?php foreach ( bbp_get_topic_types() as $key => $label ) : ?>
 
@@ -3318,7 +3311,6 @@
  *
  * @param $args This function supports these arguments:
  *  - select_id: Select id. Defaults to bbp_topic_status
- *  - tab: Tabindex
  *  - topic_id: Topic id
  *  - selected: Override the selected option
  */
@@ -3336,7 +3328,6 @@
 	 *
 	 * @param $args This function supports these arguments:
 	 *  - select_id: Select id. Defaults to bbp_topic_status
-	 *  - tab: Tabindex
 	 *  - topic_id: Topic id
 	 *  - selected: Override the selected option
 	 */
@@ -3345,7 +3336,6 @@
 		// Parse arguments against default values
 		$r = bbp_parse_args( $args, array(
 			'select_id' => 'bbp_topic_status',
-			'tab'       => bbp_get_tab_index(),
 			'topic_id'  => 0,
 			'selected'  => false
 		), 'topic_open_close_select' );
@@ -3372,13 +3362,11 @@
 			}
 		}
 
-		// Used variables
-		$tab = ! empty( $r['tab'] ) ? ' tabindex="' . (int) $r['tab'] . '"' : '';
 
 		// Start an output buffer, we'll finish it after the select loop
 		ob_start(); ?>
 
-		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ); ?>_select"<?php echo $tab; ?>>
+		<select name="<?php echo esc_attr( $r['select_id'] ) ?>" id="<?php echo esc_attr( $r['select_id'] ); ?>_select">
 
 			<?php foreach ( bbp_get_topic_statuses( $r['topic_id'] ) as $key => $label ) : ?>
 
Index: src/templates/default/bbpress/form-anonymous.php
===================================================================
--- src/templates/default/bbpress/form-anonymous.php	(revision 5555)
+++ src/templates/default/bbpress/form-anonymous.php	(working copy)
@@ -20,17 +20,17 @@
 
 		<p>
 			<label for="bbp_anonymous_author"><?php _e( 'Name (required):', 'bbpress' ); ?></label><br />
-			<input type="text" id="bbp_anonymous_author"  value="<?php bbp_author_display_name(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_anonymous_name" />
+			<input type="text" id="bbp_anonymous_author"  value="<?php bbp_author_display_name(); ?>" size="40" name="bbp_anonymous_name" />
 		</p>
 
 		<p>
 			<label for="bbp_anonymous_email"><?php _e( 'Mail (will not be published) (required):', 'bbpress' ); ?></label><br />
-			<input type="text" id="bbp_anonymous_email"   value="<?php bbp_author_email(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_anonymous_email" />
+			<input type="text" id="bbp_anonymous_email"   value="<?php bbp_author_email(); ?>" size="40" name="bbp_anonymous_email" />
 		</p>
 
 		<p>
 			<label for="bbp_anonymous_website"><?php _e( 'Website:', 'bbpress' ); ?></label><br />
-			<input type="text" id="bbp_anonymous_website" value="<?php bbp_author_url(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_anonymous_website" />
+			<input type="text" id="bbp_anonymous_website" value="<?php bbp_author_url(); ?>" size="40" name="bbp_anonymous_website" />
 		</p>
 
 		<?php do_action( 'bbp_theme_anonymous_form_extras_bottom' ); ?>
Index: src/templates/default/bbpress/form-forum.php
===================================================================
--- src/templates/default/bbpress/form-forum.php	(revision 5555)
+++ src/templates/default/bbpress/form-forum.php	(working copy)
@@ -65,7 +65,7 @@
 
 					<p>
 						<label for="bbp_forum_title"><?php printf( __( 'Forum Name (Maximum Length: %d):', 'bbpress' ), bbp_get_title_max_length() ); ?></label><br />
-						<input type="text" id="bbp_forum_title" value="<?php bbp_form_forum_title(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_forum_title" maxlength="<?php bbp_title_max_length(); ?>" />
+						<input type="text" id="bbp_forum_title" value="<?php bbp_form_forum_title(); ?>" size="40" name="bbp_forum_title" maxlength="<?php bbp_title_max_length(); ?>" />
 					</p>
 
 					<?php do_action( 'bbp_theme_after_forum_form_title' ); ?>
@@ -135,7 +135,7 @@
 
 						<?php do_action( 'bbp_theme_before_forum_form_submit_button' ); ?>
 
-						<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_forum_submit" name="bbp_forum_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+						<button type="submit" id="bbp_forum_submit" name="bbp_forum_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
 
 						<?php do_action( 'bbp_theme_after_forum_form_submit_button' ); ?>
 
Index: src/templates/default/bbpress/form-reply-move.php
===================================================================
--- src/templates/default/bbpress/form-reply-move.php	(revision 5555)
+++ src/templates/default/bbpress/form-reply-move.php	(working copy)
@@ -37,15 +37,15 @@
 							<legend><?php _e( 'Move Method', 'bbpress' ); ?></legend>
 
 							<div>
-								<input name="bbp_reply_move_option" id="bbp_reply_move_option_reply" type="radio" checked="checked" value="topic" tabindex="<?php bbp_tab_index(); ?>" />
+								<input name="bbp_reply_move_option" id="bbp_reply_move_option_reply" type="radio" checked="checked" value="topic" />
 								<label for="bbp_reply_move_option_reply"><?php printf( __( 'New topic in <strong>%s</strong> titled:', 'bbpress' ), bbp_get_forum_title( bbp_get_reply_forum_id( bbp_get_reply_id() ) ) ); ?></label>
-								<input type="text" id="bbp_reply_move_destination_title" value="<?php printf( __( 'Moved: %s', 'bbpress' ), bbp_get_reply_title() ); ?>" tabindex="<?php bbp_tab_index(); ?>" size="35" name="bbp_reply_move_destination_title" />
+								<input type="text" id="bbp_reply_move_destination_title" value="<?php printf( __( 'Moved: %s', 'bbpress' ), bbp_get_reply_title() ); ?>" size="35" name="bbp_reply_move_destination_title" />
 							</div>
 
 							<?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_reply_forum_id( bbp_get_reply_id() ), 'post__not_in' => array( bbp_get_reply_topic_id( bbp_get_reply_id() ) ) ) ) ) : ?>
 
 								<div>
-									<input name="bbp_reply_move_option" id="bbp_reply_move_option_existing" type="radio" value="existing" tabindex="<?php bbp_tab_index(); ?>" />
+									<input name="bbp_reply_move_option" id="bbp_reply_move_option_existing" type="radio" value="existing" />
 									<label for="bbp_reply_move_option_existing"><?php _e( 'Use an existing topic in this forum:', 'bbpress' ); ?></label>
 
 									<?php
@@ -69,7 +69,7 @@
 						</div>
 
 						<div class="bbp-submit-wrapper">
-							<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_move_reply_submit" name="bbp_move_reply_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+							<button type="submit" id="bbp_move_reply_submit" name="bbp_move_reply_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
 						</div>
 					</div>
 
Index: src/templates/default/bbpress/form-reply.php
===================================================================
--- src/templates/default/bbpress/form-reply.php	(revision 5555)
+++ src/templates/default/bbpress/form-reply.php	(working copy)
@@ -73,7 +73,7 @@
 
 						<p>
 							<label for="bbp_topic_tags"><?php _e( 'Tags:', 'bbpress' ); ?></label><br />
-							<input type="text" value="<?php bbp_form_topic_tags(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_tags" id="bbp_topic_tags" <?php disabled( bbp_is_topic_spam() ); ?> />
+							<input type="text" value="<?php bbp_form_topic_tags(); ?>" size="40" name="bbp_topic_tags" id="bbp_topic_tags" <?php disabled( bbp_is_topic_spam() ); ?> />
 						</p>
 
 						<?php do_action( 'bbp_theme_after_reply_form_tags' ); ?>
@@ -86,7 +86,7 @@
 
 						<p>
 
-							<input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php bbp_form_topic_subscribed(); ?> tabindex="<?php bbp_tab_index(); ?>" />
+							<input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php bbp_form_topic_subscribed(); ?> />
 
 							<?php if ( bbp_is_reply_edit() && ( bbp_get_reply_author_id() !== bbp_get_current_user_id() ) ) : ?>
 
@@ -134,13 +134,13 @@
 
 							<fieldset class="bbp-form">
 								<legend>
-									<input name="bbp_log_reply_edit" id="bbp_log_reply_edit" type="checkbox" value="1" <?php bbp_form_reply_log_edit(); ?> tabindex="<?php bbp_tab_index(); ?>" />
+									<input name="bbp_log_reply_edit" id="bbp_log_reply_edit" type="checkbox" value="1" <?php bbp_form_reply_log_edit(); ?> />
 									<label for="bbp_log_reply_edit"><?php _e( 'Keep a log of this edit:', 'bbpress' ); ?></label><br />
 								</legend>
 
 								<div>
 									<label for="bbp_reply_edit_reason"><?php printf( __( 'Optional reason for editing:', 'bbpress' ), bbp_get_current_user_name() ); ?></label><br />
-									<input type="text" value="<?php bbp_form_reply_edit_reason(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_reply_edit_reason" id="bbp_reply_edit_reason" />
+									<input type="text" value="<?php bbp_form_reply_edit_reason(); ?>" size="40" name="bbp_reply_edit_reason" id="bbp_reply_edit_reason" />
 								</div>
 							</fieldset>
 
@@ -158,7 +158,7 @@
 
 						<?php bbp_cancel_reply_to_link(); ?>
 
-						<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_reply_submit" name="bbp_reply_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+						<button type="submit" id="bbp_reply_submit" name="bbp_reply_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
 
 						<?php do_action( 'bbp_theme_after_reply_form_submit_button' ); ?>
 
Index: src/templates/default/bbpress/form-search.php
===================================================================
--- src/templates/default/bbpress/form-search.php	(revision 5555)
+++ src/templates/default/bbpress/form-search.php	(working copy)
@@ -13,7 +13,7 @@
 	<div>
 		<label class="screen-reader-text hidden" for="bbp_search"><?php _e( 'Search for:', 'bbpress' ); ?></label>
 		<input type="hidden" name="action" value="bbp-search-request" />
-		<input tabindex="<?php bbp_tab_index(); ?>" type="text" value="<?php echo esc_attr( bbp_get_search_terms() ); ?>" name="bbp_search" id="bbp_search" />
-		<input tabindex="<?php bbp_tab_index(); ?>" class="button" type="submit" id="bbp_search_submit" value="<?php esc_attr_e( 'Search', 'bbpress' ); ?>" />
+		<input type="text" value="<?php echo esc_attr( bbp_get_search_terms() ); ?>" name="bbp_search" id="bbp_search" />
+		<input class="button" type="submit" id="bbp_search_submit" value="<?php esc_attr_e( 'Search', 'bbpress' ); ?>" />
 	</div>
 </form>
Index: src/templates/default/bbpress/form-topic-merge.php
===================================================================
--- src/templates/default/bbpress/form-topic-merge.php	(revision 5555)
+++ src/templates/default/bbpress/form-topic-merge.php	(working copy)
@@ -68,17 +68,17 @@
 
 								<?php if ( bbp_is_subscriptions_active() ) : ?>
 
-									<input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+									<input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" />
 									<label for="bbp_topic_subscribers"><?php _e( 'Merge topic subscribers', 'bbpress' ); ?></label><br />
 
 								<?php endif; ?>
 
-								<input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+								<input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" />
 								<label for="bbp_topic_favoriters"><?php _e( 'Merge topic favoriters', 'bbpress' ); ?></label><br />
 
 								<?php if ( bbp_allow_topic_tags() ) : ?>
 
-									<input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+									<input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" />
 									<label for="bbp_topic_tags"><?php _e( 'Merge topic tags', 'bbpress' ); ?></label><br />
 
 								<?php endif; ?>
@@ -91,7 +91,7 @@
 						</div>
 
 						<div class="bbp-submit-wrapper">
-							<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+							<button type="submit" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
 						</div>
 					</div>
 
Index: src/templates/default/bbpress/form-topic-split.php
===================================================================
--- src/templates/default/bbpress/form-topic-split.php	(revision 5555)
+++ src/templates/default/bbpress/form-topic-split.php	(working copy)
@@ -37,15 +37,15 @@
 							<legend><?php _e( 'Split Method', 'bbpress' ); ?></legend>
 
 							<div>
-								<input name="bbp_topic_split_option" id="bbp_topic_split_option_reply" type="radio" checked="checked" value="reply" tabindex="<?php bbp_tab_index(); ?>" />
+								<input name="bbp_topic_split_option" id="bbp_topic_split_option_reply" type="radio" checked="checked" value="reply" />
 								<label for="bbp_topic_split_option_reply"><?php printf( __( 'New topic in <strong>%s</strong> titled:', 'bbpress' ), bbp_get_forum_title( bbp_get_topic_forum_id( bbp_get_topic_id() ) ) ); ?></label>
-								<input type="text" id="bbp_topic_split_destination_title" value="<?php printf( __( 'Split: %s', 'bbpress' ), bbp_get_topic_title() ); ?>" tabindex="<?php bbp_tab_index(); ?>" size="35" name="bbp_topic_split_destination_title" />
+								<input type="text" id="bbp_topic_split_destination_title" value="<?php printf( __( 'Split: %s', 'bbpress' ), bbp_get_topic_title() ); ?>" size="35" name="bbp_topic_split_destination_title" />
 							</div>
 
 							<?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
 
 								<div>
-									<input name="bbp_topic_split_option" id="bbp_topic_split_option_existing" type="radio" value="existing" tabindex="<?php bbp_tab_index(); ?>" />
+									<input name="bbp_topic_split_option" id="bbp_topic_split_option_existing" type="radio" value="existing" />
 									<label for="bbp_topic_split_option_existing"><?php _e( 'Use an existing topic in this forum:', 'bbpress' ); ?></label>
 
 									<?php
@@ -72,17 +72,17 @@
 
 								<?php if ( bbp_is_subscriptions_active() ) : ?>
 
-									<input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+									<input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" />
 									<label for="bbp_topic_subscribers"><?php _e( 'Copy subscribers to the new topic', 'bbpress' ); ?></label><br />
 
 								<?php endif; ?>
 
-								<input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+								<input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" />
 								<label for="bbp_topic_favoriters"><?php _e( 'Copy favoriters to the new topic', 'bbpress' ); ?></label><br />
 
 								<?php if ( bbp_allow_topic_tags() ) : ?>
 
-									<input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+									<input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" />
 									<label for="bbp_topic_tags"><?php _e( 'Copy topic tags to the new topic', 'bbpress' ); ?></label><br />
 
 								<?php endif; ?>
@@ -95,7 +95,7 @@
 						</div>
 
 						<div class="bbp-submit-wrapper">
-							<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+							<button type="submit" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
 						</div>
 					</div>
 
Index: src/templates/default/bbpress/form-topic-tag.php
===================================================================
--- src/templates/default/bbpress/form-topic-tag.php	(revision 5555)
+++ src/templates/default/bbpress/form-topic-tag.php	(working copy)
@@ -33,21 +33,21 @@
 
 					<div>
 						<label for="tag-name"><?php _e( 'Name:', 'bbpress' ); ?></label>
-						<input type="text" id="tag-name" name="tag-name" size="20" maxlength="40" tabindex="<?php bbp_tab_index(); ?>" value="<?php echo esc_attr( bbp_get_topic_tag_name() ); ?>" />
+						<input type="text" id="tag-name" name="tag-name" size="20" maxlength="40" value="<?php echo esc_attr( bbp_get_topic_tag_name() ); ?>" />
 					</div>
 
 					<div>
 						<label for="tag-slug"><?php _e( 'Slug:', 'bbpress' ); ?></label>
-						<input type="text" id="tag-slug" name="tag-slug" size="20" maxlength="40" tabindex="<?php bbp_tab_index(); ?>" value="<?php echo esc_attr( apply_filters( 'editable_slug', bbp_get_topic_tag_slug() ) ); ?>" />
+						<input type="text" id="tag-slug" name="tag-slug" size="20" maxlength="40" value="<?php echo esc_attr( apply_filters( 'editable_slug', bbp_get_topic_tag_slug() ) ); ?>" />
 					</div>
 
 					<div>
 						<label for="tag-description"><?php _e( 'Description:', 'bbpress' ); ?></label>
-						<input type="text" id="tag-description" name="tag-description" size="20" tabindex="<?php bbp_tab_index(); ?>" value="<?php echo esc_attr( bbp_get_topic_tag_description( array( 'before' => '', 'after' => '' ) ) ); ?>" />
+						<input type="text" id="tag-description" name="tag-description" size="20" value="<?php echo esc_attr( bbp_get_topic_tag_description( array( 'before' => '', 'after' => '' ) ) ); ?>" />
 					</div>
 
 					<div class="bbp-submit-wrapper">
-						<button type="submit" tabindex="<?php bbp_tab_index(); ?>" class="button submit"><?php esc_attr_e( 'Update', 'bbpress' ); ?></button>
+						<button type="submit" class="button submit"><?php esc_attr_e( 'Update', 'bbpress' ); ?></button>
 
 						<input type="hidden" name="tag-id" value="<?php bbp_topic_tag_id(); ?>" />
 						<input type="hidden" name="action" value="bbp-update-topic-tag" />
@@ -71,11 +71,11 @@
 
 					<div>
 						<label for="tag-existing-name"><?php _e( 'Existing tag:', 'bbpress' ); ?></label>
-						<input type="text" id="tag-existing-name" name="tag-existing-name" size="22" tabindex="<?php bbp_tab_index(); ?>" maxlength="40" />
+						<input type="text" id="tag-existing-name" name="tag-existing-name" size="22" maxlength="40" />
 					</div>
 
 					<div class="bbp-submit-wrapper">
-						<button type="submit" tabindex="<?php bbp_tab_index(); ?>" class="button submit" onclick="return confirm('<?php echo esc_js( sprintf( __( 'Are you sure you want to merge the "%s" tag into the tag you specified?', 'bbpress' ), bbp_get_topic_tag_name() ) ); ?>');"><?php esc_attr_e( 'Merge', 'bbpress' ); ?></button>
+						<button type="submit" class="button submit" onclick="return confirm('<?php echo esc_js( sprintf( __( 'Are you sure you want to merge the "%s" tag into the tag you specified?', 'bbpress' ), bbp_get_topic_tag_name() ) ); ?>');"><?php esc_attr_e( 'Merge', 'bbpress' ); ?></button>
 
 						<input type="hidden" name="tag-id" value="<?php bbp_topic_tag_id(); ?>" />
 						<input type="hidden" name="action" value="bbp-merge-topic-tag" />
@@ -103,7 +103,7 @@
 					<form id="delete_tag" name="delete_tag" method="post" action="<?php the_permalink(); ?>">
 
 						<div class="bbp-submit-wrapper">
-							<button type="submit" tabindex="<?php bbp_tab_index(); ?>" class="button submit" onclick="return confirm('<?php echo esc_js( sprintf( __( 'Are you sure you want to delete the "%s" tag? This is permanent and cannot be undone.', 'bbpress' ), bbp_get_topic_tag_name() ) ); ?>');"><?php esc_attr_e( 'Delete', 'bbpress' ); ?></button>
+							<button type="submit" class="button submit" onclick="return confirm('<?php echo esc_js( sprintf( __( 'Are you sure you want to delete the "%s" tag? This is permanent and cannot be undone.', 'bbpress' ), bbp_get_topic_tag_name() ) ); ?>');"><?php esc_attr_e( 'Delete', 'bbpress' ); ?></button>
 
 							<input type="hidden" name="tag-id" value="<?php bbp_topic_tag_id(); ?>" />
 							<input type="hidden" name="action" value="bbp-delete-topic-tag" />
Index: src/templates/default/bbpress/form-topic.php
===================================================================
--- src/templates/default/bbpress/form-topic.php	(revision 5555)
+++ src/templates/default/bbpress/form-topic.php	(working copy)
@@ -76,7 +76,7 @@
 
 					<p>
 						<label for="bbp_topic_title"><?php printf( __( 'Topic Title (Maximum Length: %d):', 'bbpress' ), bbp_get_title_max_length() ); ?></label><br />
-						<input type="text" id="bbp_topic_title" value="<?php bbp_form_topic_title(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_title" maxlength="<?php bbp_title_max_length(); ?>" />
+						<input type="text" id="bbp_topic_title" value="<?php bbp_form_topic_title(); ?>" size="40" name="bbp_topic_title" maxlength="<?php bbp_title_max_length(); ?>" />
 					</p>
 
 					<?php do_action( 'bbp_theme_after_topic_form_title' ); ?>
@@ -102,7 +102,7 @@
 
 						<p>
 							<label for="bbp_topic_tags"><?php _e( 'Topic Tags:', 'bbpress' ); ?></label><br />
-							<input type="text" value="<?php bbp_form_topic_tags(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_tags" id="bbp_topic_tags" <?php disabled( bbp_is_topic_spam() ); ?> />
+							<input type="text" value="<?php bbp_form_topic_tags(); ?>" size="40" name="bbp_topic_tags" id="bbp_topic_tags" <?php disabled( bbp_is_topic_spam() ); ?> />
 						</p>
 
 						<?php do_action( 'bbp_theme_after_topic_form_tags' ); ?>
@@ -160,7 +160,7 @@
 						<?php do_action( 'bbp_theme_before_topic_form_subscriptions' ); ?>
 
 						<p>
-							<input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe" <?php bbp_form_topic_subscribed(); ?> tabindex="<?php bbp_tab_index(); ?>" />
+							<input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe" <?php bbp_form_topic_subscribed(); ?> />
 
 							<?php if ( bbp_is_topic_edit() && ( bbp_get_topic_author_id() !== bbp_get_current_user_id() ) ) : ?>
 
@@ -183,13 +183,13 @@
 
 						<fieldset class="bbp-form">
 							<legend>
-								<input name="bbp_log_topic_edit" id="bbp_log_topic_edit" type="checkbox" value="1" <?php bbp_form_topic_log_edit(); ?> tabindex="<?php bbp_tab_index(); ?>" />
+								<input name="bbp_log_topic_edit" id="bbp_log_topic_edit" type="checkbox" value="1" <?php bbp_form_topic_log_edit(); ?> />
 								<label for="bbp_log_topic_edit"><?php _e( 'Keep a log of this edit:', 'bbpress' ); ?></label><br />
 							</legend>
 
 							<div>
 								<label for="bbp_topic_edit_reason"><?php printf( __( 'Optional reason for editing:', 'bbpress' ), bbp_get_current_user_name() ); ?></label><br />
-								<input type="text" value="<?php bbp_form_topic_edit_reason(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_edit_reason" id="bbp_topic_edit_reason" />
+								<input type="text" value="<?php bbp_form_topic_edit_reason(); ?>" size="40" name="bbp_topic_edit_reason" id="bbp_topic_edit_reason" />
 							</div>
 						</fieldset>
 
@@ -203,7 +203,7 @@
 
 						<?php do_action( 'bbp_theme_before_topic_form_submit_button' ); ?>
 
-						<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_topic_submit" name="bbp_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+						<button type="submit" id="bbp_topic_submit" name="bbp_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
 
 						<?php do_action( 'bbp_theme_after_topic_form_submit_button' ); ?>
 
Index: src/templates/default/bbpress/form-user-edit.php
===================================================================
--- src/templates/default/bbpress/form-user-edit.php	(revision 5555)
+++ src/templates/default/bbpress/form-user-edit.php	(working copy)
@@ -22,17 +22,17 @@
 
 		<div>
 			<label for="first_name"><?php _e( 'First Name', 'bbpress' ) ?></label>
-			<input type="text" name="first_name" id="first_name" value="<?php bbp_displayed_user_field( 'first_name', 'edit' ); ?>" class="regular-text" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="first_name" id="first_name" value="<?php bbp_displayed_user_field( 'first_name', 'edit' ); ?>" class="regular-text" />
 		</div>
 
 		<div>
 			<label for="last_name"><?php _e( 'Last Name', 'bbpress' ) ?></label>
-			<input type="text" name="last_name" id="last_name" value="<?php bbp_displayed_user_field( 'last_name', 'edit' ); ?>" class="regular-text" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="last_name" id="last_name" value="<?php bbp_displayed_user_field( 'last_name', 'edit' ); ?>" class="regular-text" />
 		</div>
 
 		<div>
 			<label for="nickname"><?php _e( 'Nickname', 'bbpress' ); ?></label>
-			<input type="text" name="nickname" id="nickname" value="<?php bbp_displayed_user_field( 'nickname', 'edit' ); ?>" class="regular-text" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="nickname" id="nickname" value="<?php bbp_displayed_user_field( 'nickname', 'edit' ); ?>" class="regular-text" />
 		</div>
 
 		<div>
@@ -55,14 +55,14 @@
 
 		<div>
 			<label for="url"><?php _e( 'Website', 'bbpress' ) ?></label>
-			<input type="text" name="url" id="url" value="<?php bbp_displayed_user_field( 'user_url', 'edit' ); ?>" class="regular-text code" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="url" id="url" value="<?php bbp_displayed_user_field( 'user_url', 'edit' ); ?>" class="regular-text code" />
 		</div>
 
 		<?php foreach ( bbp_edit_user_contact_methods() as $name => $desc ) : ?>
 
 			<div>
 				<label for="<?php echo esc_attr( $name ); ?>"><?php echo apply_filters( 'user_' . $name . '_label', $desc ); ?></label>
-				<input type="text" name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $name ); ?>" value="<?php bbp_displayed_user_field( $name, 'edit' ); ?>" class="regular-text" tabindex="<?php bbp_tab_index(); ?>" />
+				<input type="text" name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $name ); ?>" value="<?php bbp_displayed_user_field( $name, 'edit' ); ?>" class="regular-text" />
 			</div>
 
 		<?php endforeach; ?>
@@ -80,7 +80,7 @@
 
 		<div>
 			<label for="description"><?php _e( 'Biographical Info', 'bbpress' ); ?></label>
-			<textarea name="description" id="description" rows="5" cols="30" tabindex="<?php bbp_tab_index(); ?>"><?php bbp_displayed_user_field( 'description', 'edit' ); ?></textarea>
+			<textarea name="description" id="description" rows="5" cols="30"><?php bbp_displayed_user_field( 'description', 'edit' ); ?></textarea>
 		</div>
 
 		<?php do_action( 'bbp_user_edit_after_about' ); ?>
@@ -96,13 +96,13 @@
 
 		<div>
 			<label for="user_login"><?php _e( 'Username', 'bbpress' ); ?></label>
-			<input type="text" name="user_login" id="user_login" value="<?php bbp_displayed_user_field( 'user_login', 'edit' ); ?>" disabled="disabled" class="regular-text" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="user_login" id="user_login" value="<?php bbp_displayed_user_field( 'user_login', 'edit' ); ?>" disabled="disabled" class="regular-text" />
 		</div>
 
 		<div>
 			<label for="email"><?php _e( 'Email', 'bbpress' ); ?></label>
 
-			<input type="text" name="email" id="email" value="<?php bbp_displayed_user_field( 'user_email', 'edit' ); ?>" class="regular-text" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="email" id="email" value="<?php bbp_displayed_user_field( 'user_email', 'edit' ); ?>" class="regular-text" />
 
 			<?php
 
@@ -123,10 +123,10 @@
 		<div id="password">
 			<label for="pass1"><?php _e( 'New Password', 'bbpress' ); ?></label>
 			<fieldset class="bbp-form password">
-				<input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" tabindex="<?php bbp_tab_index(); ?>" />
+				<input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" />
 				<span class="description"><?php _e( 'If you would like to change the password type a new one. Otherwise leave this blank.', 'bbpress' ); ?></span>
 
-				<input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" tabindex="<?php bbp_tab_index(); ?>" />
+				<input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" />
 				<span class="description"><?php _e( 'Type your new password again.', 'bbpress' ); ?></span><br />
 
 				<div id="pass-strength-result"></div>
@@ -152,7 +152,7 @@
 				<div>
 					<label for="super_admin"><?php _e( 'Network Role', 'bbpress' ); ?></label>
 					<label>
-						<input class="checkbox" type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( bbp_get_displayed_user_id() ) ); ?> tabindex="<?php bbp_tab_index(); ?>" />
+						<input class="checkbox" type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( bbp_get_displayed_user_id() ) ); ?> />
 						<?php _e( 'Grant this user super admin privileges for the Network.', 'bbpress' ); ?>
 					</label>
 				</div>
@@ -175,7 +175,7 @@
 
 			<?php bbp_edit_user_form_fields(); ?>
 
-			<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_user_edit_submit" name="bbp_user_edit_submit" class="button submit user-submit"><?php bbp_is_user_home_edit() ? _e( 'Update Profile', 'bbpress' ) : _e( 'Update User', 'bbpress' ); ?></button>
+			<button type="submit" id="bbp_user_edit_submit" name="bbp_user_edit_submit" class="button submit user-submit"><?php bbp_is_user_home_edit() ? _e( 'Update Profile', 'bbpress' ) : _e( 'Update User', 'bbpress' ); ?></button>
 		</div>
 	</fieldset>
 
Index: src/templates/default/bbpress/form-user-login.php
===================================================================
--- src/templates/default/bbpress/form-user-login.php	(revision 5555)
+++ src/templates/default/bbpress/form-user-login.php	(working copy)
@@ -15,16 +15,16 @@
 
 		<div class="bbp-username">
 			<label for="user_login"><?php _e( 'Username', 'bbpress' ); ?>: </label>
-			<input type="text" name="log" value="<?php bbp_sanitize_val( 'user_login', 'text' ); ?>" size="20" id="user_login" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="log" value="<?php bbp_sanitize_val( 'user_login', 'text' ); ?>" size="20" id="user_login" />
 		</div>
 
 		<div class="bbp-password">
 			<label for="user_pass"><?php _e( 'Password', 'bbpress' ); ?>: </label>
-			<input type="password" name="pwd" value="<?php bbp_sanitize_val( 'user_pass', 'password' ); ?>" size="20" id="user_pass" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="password" name="pwd" value="<?php bbp_sanitize_val( 'user_pass', 'password' ); ?>" size="20" id="user_pass" />
 		</div>
 
 		<div class="bbp-remember-me">
-			<input type="checkbox" name="rememberme" value="forever" <?php checked( bbp_get_sanitize_val( 'rememberme', 'checkbox' ) ); ?> id="rememberme" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="checkbox" name="rememberme" value="forever" <?php checked( bbp_get_sanitize_val( 'rememberme', 'checkbox' ) ); ?> id="rememberme" />
 			<label for="rememberme"><?php _e( 'Keep me signed in', 'bbpress' ); ?></label>
 		</div>
 
@@ -32,7 +32,7 @@
 
 		<div class="bbp-submit-wrapper">
 
-			<button type="submit" tabindex="<?php bbp_tab_index(); ?>" name="user-submit" class="button submit user-submit"><?php _e( 'Log In', 'bbpress' ); ?></button>
+			<button type="submit" name="user-submit" class="button submit user-submit"><?php _e( 'Log In', 'bbpress' ); ?></button>
 
 			<?php bbp_user_login_fields(); ?>
 
Index: src/templates/default/bbpress/form-user-lost-pass.php
===================================================================
--- src/templates/default/bbpress/form-user-lost-pass.php	(revision 5555)
+++ src/templates/default/bbpress/form-user-lost-pass.php	(working copy)
@@ -16,7 +16,7 @@
 		<div class="bbp-username">
 			<p>
 				<label for="user_login" class="hide"><?php _e( 'Username or Email', 'bbpress' ); ?>: </label>
-				<input type="text" name="user_login" value="" size="20" id="user_login" tabindex="<?php bbp_tab_index(); ?>" />
+				<input type="text" name="user_login" value="" size="20" id="user_login" />
 			</p>
 		</div>
 
@@ -24,7 +24,7 @@
 
 		<div class="bbp-submit-wrapper">
 
-			<button type="submit" tabindex="<?php bbp_tab_index(); ?>" name="user-submit" class="button submit user-submit"><?php _e( 'Reset My Password', 'bbpress' ); ?></button>
+			<button type="submit" name="user-submit" class="button submit user-submit"><?php _e( 'Reset My Password', 'bbpress' ); ?></button>
 
 			<?php bbp_user_lost_pass_fields(); ?>
 
Index: src/templates/default/bbpress/form-user-register.php
===================================================================
--- src/templates/default/bbpress/form-user-register.php	(revision 5555)
+++ src/templates/default/bbpress/form-user-register.php	(working copy)
@@ -22,19 +22,19 @@
 
 		<div class="bbp-username">
 			<label for="user_login"><?php _e( 'Username', 'bbpress' ); ?>: </label>
-			<input type="text" name="user_login" value="<?php bbp_sanitize_val( 'user_login' ); ?>" size="20" id="user_login" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="user_login" value="<?php bbp_sanitize_val( 'user_login' ); ?>" size="20" id="user_login" />
 		</div>
 
 		<div class="bbp-email">
 			<label for="user_email"><?php _e( 'Email', 'bbpress' ); ?>: </label>
-			<input type="text" name="user_email" value="<?php bbp_sanitize_val( 'user_email' ); ?>" size="20" id="user_email" tabindex="<?php bbp_tab_index(); ?>" />
+			<input type="text" name="user_email" value="<?php bbp_sanitize_val( 'user_email' ); ?>" size="20" id="user_email" />
 		</div>
 
 		<?php do_action( 'register_form' ); ?>
 
 		<div class="bbp-submit-wrapper">
 
-			<button type="submit" tabindex="<?php bbp_tab_index(); ?>" name="user-submit" class="button submit user-submit"><?php _e( 'Register', 'bbpress' ); ?></button>
+			<button type="submit" name="user-submit" class="button submit user-submit"><?php _e( 'Register', 'bbpress' ); ?></button>
 
 			<?php bbp_user_register_fields(); ?>