diff --git a/e107_core/templates/user_template.php b/e107_core/templates/user_template.php
index a4cba5ff3..d663e7a96 100644
--- a/e107_core/templates/user_template.php
+++ b/e107_core/templates/user_template.php
@@ -316,11 +316,13 @@ if(deftrue('BOOTSTRAP'))
 
 
 	// View shortcode wrappers.
-	$USER_WRAPPER['view']['USER_COMMENTPOSTS']  = '<div class="col-xs-12 col-md-4">'.LAN_USER_68.'</div><div class="col-xs-12 col-md-8">{---}';
-	$USER_WRAPPER['view']['USER_COMMENTPER']    = ' ( {---}% )</div>';
-	$USER_WRAPPER['view']['USER_SIGNATURE']     = '<div>{---}</div>';
-	$USER_WRAPPER['view']['USER_RATING']        = '<div>{---}</div>';
-	$USER_WRAPPER['view']['USER_SENDPM']         = '<div>{---}</div>';
+	$USER_WRAPPER['view']['USER_COMMENTPOSTS']      = '<div class="col-xs-12 col-md-4">'.LAN_USER_68.'</div><div class="col-xs-12 col-md-8">{---}';
+	$USER_WRAPPER['view']['USER_COMMENTPER']        = ' ( {---}% )</div>';
+	$USER_WRAPPER['view']['USER_SIGNATURE']         = '<div>{---}</div>';
+	$USER_WRAPPER['view']['USER_RATING']            = '<div>{---}</div>';
+	$USER_WRAPPER['view']['USER_SENDPM']            = '<div>{---}</div>';
+	$USER_WRAPPER['view']['PROFILE_COMMENTS']       = '<div class="panel panel-default clearfix">{---}';
+	$USER_WRAPPER['view']['PROFILE_COMMENT_FORM']   = '{---} </div>';
 
 	$USER_TEMPLATE['view'] 				= '
 	{SETIMAGE: w=600}
@@ -370,10 +372,10 @@ if(deftrue('BOOTSTRAP'))
 	                </ul>
 	            </div>
 	        </div>
-	        <div class="panel panel-default clearfix">
+
 	            {PROFILE_COMMENTS}
 	            {PROFILE_COMMENT_FORM}
-	        </div>
+
 	    </div>
 	</div>
 	';
diff --git a/user.php b/user.php
index 48110fce1..0c750b838 100644
--- a/user.php
+++ b/user.php
@@ -121,7 +121,7 @@ else
 	$USER_SHORT_TEMPLATE_END    = $USER_TEMPLATE['list']['end'];
 }
 
-$TEMPLATE = str_replace('{USER_EMBED_USERPROFILE}','{USER_ADDONS}', $TEMPLATE); // BC Fix
+$USER_FULL_TEMPLATE = str_replace('{USER_EMBED_USERPROFILE}','{USER_ADDONS}', $USER_FULL_TEMPLATE); // BC Fix
 
 $user_shortcodes = e107::getScBatch('user');
 $user_shortcodes->wrapper('user/view');
@@ -129,7 +129,6 @@ $user_shortcodes->wrapper('user/view');
 
 
 
-
 /*
 if (file_exists(THEME."user_template.php"))
 {