diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-shortcode.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-shortcode.php
index f7ee8ee4..6de6c799 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-shortcode.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-shortcode.php
@@ -23,7 +23,7 @@ class SP_Meta_Box_Staff_Shortcode {
 		<p class="howto">
 			<?php _e( 'Copy this code and paste it into your post, page or text widget content.', 'sportspress' ); ?>
 		</p>
-		<p><input type="text" value="<?php sp_shortcode_template( 'staff', $post->ID ); ?>" readonly="readonly" class="code widefat"></p>
+		<p><input type="text" value="<?php sp_shortcode_template( 'staff_profile', $post->ID ); ?>" readonly="readonly" class="code widefat"></p>
 		<?php
 	}
 }
\ No newline at end of file
diff --git a/includes/class-sp-shortcodes.php b/includes/class-sp-shortcodes.php
index db2d76bb..5ad84fa0 100644
--- a/includes/class-sp-shortcodes.php
+++ b/includes/class-sp-shortcodes.php
@@ -23,6 +23,7 @@ class SP_Shortcodes {
 			'player_details'    => __CLASS__ . '::player_details',
 			'player_statistics' => __CLASS__ . '::player_statistics',
 			'staff'             => __CLASS__ . '::staff',
+			'staff_profile'     => __CLASS__ . '::staff_profile',
 			'event_calendar'    => __CLASS__ . '::event_calendar',
 			'event_list'        => __CLASS__ . '::event_list',
 			'event_blocks'      => __CLASS__ . '::event_blocks',
@@ -232,4 +233,15 @@ class SP_Shortcodes {
 	public static function staff( $atts ) {
 		return self::shortcode_wrapper( array( 'SP_Shortcode_Staff', 'output' ), $atts );
 	}
+
+	/**
+	 * Staff profile shortcode.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @return string
+	 */
+	public static function staff_profile( $atts ) {
+		return self::shortcode_wrapper( array( 'SP_Shortcode_Staff_Profile', 'output' ), $atts );
+	}
 }
diff --git a/includes/shortcodes/class-sp-shortcode-staff-profile.php b/includes/shortcodes/class-sp-shortcode-staff-profile.php
new file mode 100644
index 00000000..28e5fd77
--- /dev/null
+++ b/includes/shortcodes/class-sp-shortcode-staff-profile.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Staff Profile Shortcode
+ *
+ * @author 		ThemeBoy
+ * @category 	Shortcodes
+ * @package 	SportsPress/Shortcodes/Staff
+ * @version     1.4.7
+ */
+class SP_Shortcode_Staff_Profile {
+
+	/**
+	 * Output the staff shortcode.
+	 *
+	 * @param array $atts
+	 */
+	public static function output( $atts ) {
+
+		if ( ! isset( $atts['id'] ) && isset( $atts[0] ) && is_numeric( $atts[0] ) )
+			$atts['id'] = $atts[0];
+
+		sp_get_template( 'staff-header.php',  $atts );
+		sp_get_template( 'staff-photo.php',   $atts );
+		sp_get_template( 'staff-details.php', $atts );
+		sp_get_template( 'staff-excerpt.php', $atts );
+		sp_get_template( 'staff-content.php', $atts );
+	}
+}
diff --git a/includes/shortcodes/class-sp-shortcode-staff.php b/includes/shortcodes/class-sp-shortcode-staff.php
index 743bd0cf..f945df48 100644
--- a/includes/shortcodes/class-sp-shortcode-staff.php
+++ b/includes/shortcodes/class-sp-shortcode-staff.php
@@ -19,10 +19,7 @@ class SP_Shortcode_Staff {
 		if ( ! isset( $atts['id'] ) && isset( $atts[0] ) && is_numeric( $atts[0] ) )
 			$atts['id'] = $atts[0];
 
-		sp_get_template( 'staff-header.php',  $atts );
 		sp_get_template( 'staff-photo.php',   $atts );
 		sp_get_template( 'staff-details.php', $atts );
-		sp_get_template( 'staff-excerpt.php', $atts );
-		sp_get_template( 'staff-content.php', $atts );
 	}
 }