diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index b2ac70e56..d39e6550f 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -756,6 +756,7 @@ class Profiles extends Controller {
 				'$country_name' => array('country_name', t('Country'), $r[0]['country_name']),
 				'$gender'       => self::gender_selector($r[0]['gender']),
 				'$gender_min'   => self::gender_selector_min($r[0]['gender']),
+				'$gender_text'  => self::gender_text($r[0]['gender']),
 				'$marital'      => self::marital_selector($r[0]['marital']),
 				'$marital_min'  => self::marital_selector_min($r[0]['marital']),
 				'$with'         => array('with', t("Who (if applicable)"), $r[0]['partner'], t('Examples: cathy123, Cathy Williams, cathy@example.com')),
@@ -962,6 +963,16 @@ static function gender_selector_min($current="",$suffix="") {
 	return $o;
 }	
 
+static function gender_text($current="",$suffix="") {
+	$o = '';
+
+	if(! get_config('system','profile_gender_textfield'))
+		return $o;
+
+	$o .= "<input type = \"text\" class=\"form-control\" name=\"gender$suffix\" id=\"gender-select$suffix\" value=\"" . urlencode($current) . "\" >";
+	return $o;
+}	
+
 
 
 
diff --git a/include/channel.php b/include/channel.php
index d2873a910..9b1382583 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2002,7 +2002,7 @@ function get_profile_fields_basic($filter = 0) {
 	$profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null);
 
 	if(! $profile_fields_basic)
-		$profile_fields_basic = array('fullname','pdesc','chandesc','gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact');
+		$profile_fields_basic = array('fullname','pdesc','chandesc','basic_gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact');
 
 	$x = array();
 	if($profile_fields_basic)
@@ -2017,7 +2017,7 @@ function get_profile_fields_advanced($filter = 0) {
 	$basic = get_profile_fields_basic($filter);
 	$profile_fields_advanced = (($filter == 0) ? get_config('system','profile_fields_advanced') : null);
 	if(! $profile_fields_advanced)
-		$profile_fields_advanced = array('comms', 'address','locality','postal_code','partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education');
+		$profile_fields_advanced = array('comms', 'address','locality','postal_code','advanced_gender', 'partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education');
 
 	$x = array();
 	if($basic)
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 79cbe7187..4c5168bce 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -70,11 +70,11 @@
 							{{include file="field_input.tpl" field=$pdesc}}
 							{{/if}}
 
-							{{if $fields.gender}}
+							{{if $fields.basic_gender || $fields.advanced_gender || $fields.gender}}
 							<div id="profile-edit-gender-wrapper" class="form-group field select" >
 							<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}}</label>
-							{{if $advanced}}
-							{{$gender}}
+							{{if ($advanced && $fields.gender) || $fields.advanced_gender}}
+							{{if $gender_text}}{{$gender_text}}{{else}}{{$gender}}{{/if}}
 							{{else}}
 							{{$gender_min}}
 							{{/if}}