diff --git a/e107_core/shortcodes/batch/usersettings_shortcodes.php b/e107_core/shortcodes/batch/usersettings_shortcodes.php
index 49b4ab421..6f65c9d82 100755
--- a/e107_core/shortcodes/batch/usersettings_shortcodes.php
+++ b/e107_core/shortcodes/batch/usersettings_shortcodes.php
@@ -306,12 +306,15 @@ class usersettings_shortcodes extends e_shortcode
 			$text = $this->sc_userextended_cat($cat['user_extended_struct_id']);
 			$ret .= $text;
 			$catName = vartrue($cat['user_extended_struct_text'], $cat['user_extended_struct_name']);
-			$tabs[] = array('caption'=>$catName, 'text'=>$text);
+			if(!empty($text))
+			{
+				$tabs[] = array('caption'=>$catName, 'text'=>$text);
+			}
 		}
 		
 		
 		
-		if($parm == 'tabs' && deftrue('BOOTSTRAP')===3)
+		if(($parm == 'tabs') && !empty($tabs) && deftrue('BOOTSTRAP')===3)
 		{
 			return e107::getForm()->tabs($tabs);		
 		}
diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php
index 33ca024f1..f0d161246 100755
--- a/e107_core/templates/usersettings_template.php
+++ b/e107_core/templates/usersettings_template.php
@@ -215,9 +215,7 @@ $USERSETTINGS_WRAPPER['edit']['CUSTOMTITLE'] =			"<div class='form-group'>
 
 $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = 			"<div class='form-group'>
 															<label for='userclasses' class='col-sm-3 control-label'>".LAN_USER_76.":".req($pref['signup_option_class'])."</label>
-														       	<div class='col-sm-9'>{---}
-														       	<br /><span class='smalltext'>".LAN_USER_73."</span>
-														       	</div>
+														       	<div class='col-sm-9'>{---}</div>
 														   </div>
 														";