diff --git a/e107_core/shortcodes/batch/usersettings_shortcodes.php b/e107_core/shortcodes/batch/usersettings_shortcodes.php
index 9287a8a98..9a0b5ef5f 100755
--- a/e107_core/shortcodes/batch/usersettings_shortcodes.php
+++ b/e107_core/shortcodes/batch/usersettings_shortcodes.php
@@ -292,7 +292,7 @@ class usersettings_shortcodes extends e_shortcode
 		
 		$tabs = array();
 		
-		if($parm == 'tabs')
+		if($parm == 'tabs' && deftrue('BOOTSTRAP'))
 		{
 			$this->extendedTabs = true;	
 		}
@@ -308,13 +308,13 @@ class usersettings_shortcodes extends e_shortcode
 		}
 		
 		
-		if($parm == 'tabs' && deftrue('BOOTSTRAP'))
+		
+		if($parm == 'tabs' && deftrue('BOOTSTRAP')===3)
 		{
 			return e107::getForm()->tabs($tabs);		
 		}
 		
 		
-		
 		return $ret;
 	}
 	
@@ -324,11 +324,12 @@ class usersettings_shortcodes extends e_shortcode
 	{ 
 		global $usersettings_shortcodes, $USER_EXTENDED_CAT, $extended_showed;
 		
-		if(deftrue('BOOTSTRAP'))
+		if(deftrue('BOOTSTRAP')===3)
 		{
 			$USER_EXTENDED_CAT = e107::getCoreTemplate('usersettings','extended-category'); 
 		}
 		
+		
 		$sql = e107::getDb();
 		$tp = e107::getParser();
 		
@@ -389,10 +390,10 @@ class usersettings_shortcodes extends e_shortcode
 	
 	
 	function sc_userextended_field($parm='')
-	{ 
+	{		 
 		global $usersettings_shortcodes, $extended_showed, $ue, $USEREXTENDED_FIELD, $REQUIRED_FIELD;
 		
-		if(deftrue('BOOTSTRAP'))
+		if(deftrue('BOOTSTRAP')===3)
 		{
 			$USEREXTENDED_FIELD = e107::getCoreTemplate('usersettings','extended-field'); 
 		}
diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php
index bb7260f60..33ca024f1 100755
--- a/e107_core/templates/usersettings_template.php
+++ b/e107_core/templates/usersettings_template.php
@@ -181,7 +181,7 @@ $USERSETTINGS_EDIT = "
 	
 	
 	
-// e107 v2. bootstrap3 compatible. 
+// e107 v2. bootstrap3 compatible template. 
 
 $USERSETTINGS_WRAPPER['edit']['USERNAME'] =				"<div class='form-group'>
 															<label for='username' class='col-sm-3 control-label'>".LAN_USER_01."</label>
@@ -246,7 +246,7 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE']			= "<div class='form-group'>
 
 
 
-
+// Bootstrap 3 only. 
 
 $USERSETTINGS_TEMPLATE['edit'] = "
 
diff --git a/e107_handlers/user_extended_class.php b/e107_handlers/user_extended_class.php
index b2b6bebfd..9873762ef 100644
--- a/e107_handlers/user_extended_class.php
+++ b/e107_handlers/user_extended_class.php
@@ -688,7 +688,7 @@ class e107_user_extended
 		{
 			case EUF_TEXT :  //textbox
 			case EUF_INTEGER :  //integer
-		 		$ret = "<input id='{$fid}' name='{$fname}' value='{$curval}' {$include} {$required} />";
+		 		$ret = "<input id='{$fid}' type='text' name='{$fname}' value='{$curval}' {$include} {$required} />";
 			
 		  		return $ret;
 		  	break;