diff --git a/includes/admin/settings/class-sp-settings-teams.php b/includes/admin/settings/class-sp-settings-teams.php
index 893b7bb4..9124e77d 100644
--- a/includes/admin/settings/class-sp-settings-teams.php
+++ b/includes/admin/settings/class-sp-settings-teams.php
@@ -51,13 +51,21 @@ class SP_Settings_Teams extends SP_Settings_Page {
 				array( 'type' 	=> 'team_tabs' ),
 
 				array(
-					'title'     => __( 'Link', 'sportspress' ),
-					'desc' 		=> __( 'Link teams', 'sportspress' ),
-					'id' 		=> 'sportspress_link_teams',
+					'title'     => __( 'Staff', 'sportspress' ),
+					'desc' 		=> __( 'Link staff', 'sportspress' ),
+					'id' 		=> 'sportspress_team_link_staff',
 					'default'	=> 'no',
 					'type' 		=> 'checkbox',
 				),
 
+                array(
+                    'title'     => __( 'Link', 'sportspress' ),
+                    'desc' 		=> __( 'Link teams', 'sportspress' ),
+                    'id' 		=> 'sportspress_link_teams',
+                    'default'	=> 'no',
+                    'type' 		=> 'checkbox',
+                ),
+
 				array(
 					'title'     => __( 'Venue', 'sportspress' ),
 					'desc' 		=> __( 'Link venues', 'sportspress' ),
diff --git a/templates/team-staff.php b/templates/team-staff.php
index ae006a9a..601fa681 100644
--- a/templates/team-staff.php
+++ b/templates/team-staff.php
@@ -14,6 +14,7 @@ if ( ! isset( $id ) )
 
 $team = new SP_Team( $id );
 $members = $team->staff();
+$link_staff = get_option( 'sportspress_team_link_staff', 'no' ) === 'yes' ? true : false;
 
 foreach ( $members as $staff ):
 	$id = $staff->ID;
@@ -27,7 +28,7 @@ foreach ( $members as $staff ):
 		$name = '<span class="sp-staff-role">' . implode( '<span class="sp-staff-role-delimiter">/</span>', $roles ) . '</span> ' . $name;
 	endif;
 	?>
-	<h4 class="sp-staff-name"><?php echo $name; ?></h4>
+	<h4 class="sp-staff-name"><?php echo $link_staff ? '<a href="'. get_permalink( $id ) .'">'. $name .'</a>' : $name ?></h4>
 	<?php
 	sp_get_template( 'staff-photo.php', array( 'id' => $id ) );
 	sp_get_template( 'staff-details.php', array( 'id' => $id ) );