diff --git a/src/bp-core/admin/bp-core-admin-types.php b/src/bp-core/admin/bp-core-admin-types.php
index 80e9982b2..6a419d5f3 100644
--- a/src/bp-core/admin/bp-core-admin-types.php
+++ b/src/bp-core/admin/bp-core-admin-types.php
@@ -54,6 +54,8 @@ function bp_core_admin_insert_type( $args = array() ) {
 	$default_args = array(
 		'taxonomy'   => '',
 		'bp_type_id' => '',
+		'bp_type_singular_name' => '',
+        'bp_type_name' => '',
 	);
 
 	$args = array_map( 'wp_unslash', $args );
@@ -66,13 +68,32 @@ function bp_core_admin_insert_type( $args = array() ) {
 	if ( ! $args['bp_type_id'] || ! $args['taxonomy'] ) {
 		 return new WP_Error(
 			 'invalid_type_taxonomy',
-			 __( 'The Type ID value is missing', 'buddypress' ),
+			 __( 'Member Type ID value is missing', 'buddypress' ),
 			 array(
 				'message' => 1,
 			 )
 		);
 	}
 
+	if ( ! $args['bp_type_singular_name'] ) {
+         return new WP_Error(
+             'empty_field_singular',
+             __( 'Member Type Singular Name value is missing', 'buddypress' ),
+             array(
+                'message' => 11,
+             )
+        );
+    }
+    if ( ! $args['bp_type_name'] ) {
+         return new WP_Error(
+             'empty_field_plural',
+             __( 'Member Type Plural Name value is missing', 'buddypress' ),
+             array(
+                'message' => 12,
+             )
+        );
+    }
+
 	$type_id       = sanitize_title( $args['bp_type_id'] );
 	$type_taxonomy = sanitize_key( $args['taxonomy'] );
 
diff --git a/src/bp-core/bp-core-functions.php b/src/bp-core/bp-core-functions.php
index d98b73e1c..910f48465 100644
--- a/src/bp-core/bp-core-functions.php
+++ b/src/bp-core/bp-core-functions.php
@@ -3289,8 +3289,8 @@ function bp_get_taxonomy_common_args() {
  */
 function bp_get_taxonomy_common_labels() {
 	return array(
-		'bp_type_name'           => _x( 'Plural Name', 'BP Type name label', 'buddypress' ),
-		'bp_type_singular_name'  => _x( 'Singular name', 'BP Type singular name label', 'buddypress' ),
+		'bp_type_name'           => _x( 'Plural Name (required)', 'BP Type name label', 'buddypress' ),
+		'bp_type_singular_name'  => _x( 'Singular Name (required)', 'BP Type singular name label', 'buddypress' ),
 		'bp_type_has_directory'  => _x( 'Has Directory View', 'BP Type has directory checkbox label', 'buddypress' ),
 		'bp_type_directory_slug' => _x( 'Custom type directory slug', 'BP Type slug label', 'buddypress' ),
 	);
diff --git a/src/bp-members/bp-members-admin.php b/src/bp-members/bp-members-admin.php
index 7bef5cd9b..5f1ab28d0 100644
--- a/src/bp-members/bp-members-admin.php
+++ b/src/bp-members/bp-members-admin.php
@@ -107,6 +107,8 @@ function bp_members_type_admin_updated_messages( $messages = array() ) {
 		8  => __( 'Sorry, there was an error while trying to delete this Member type.', 'buddypress' ),
 		9  => __( 'Member type successfully deleted.', 'buddypress' ),
 		10 => __( 'Member type could not be updated due to missing required information.', 'buddypress' ),
+		11 => __( 'Please define the Member Type Singular Name field.', 'buddypress' ),
+        12 => __( 'Please define the Member Type Plural Name field.', 'buddypress' ),
 	);
 
 	return $messages;
diff --git a/src/bp-members/bp-members-functions.php b/src/bp-members/bp-members-functions.php
index 129a6f93d..e2fe05dd5 100644
--- a/src/bp-members/bp-members-functions.php
+++ b/src/bp-members/bp-members-functions.php
@@ -2740,7 +2740,7 @@ function bp_get_member_type_tax_labels() {
 			'back_to_items'              => _x( '← Back to Member Types', 'Member type taxonomy back to items label', 'buddypress' ),
 
 			// Specific to BuddyPress.
-			'bp_type_id_label'           => _x( 'Member Type ID', 'BP Member type ID label', 'buddypress' ),
+			'bp_type_id_label'           => _x( 'Member Type ID (required)', 'BP Member type ID label', 'buddypress' ),
 			'bp_type_id_description'     => _x( 'Enter a lower-case string without spaces or special characters (used internally to identify the member type).', 'BP Member type ID description', 'buddypress' ),
 			'bp_type_show_in_list'       => _x( 'Show on Member', 'BP Member type show in list', 'buddypress' ),
 		)