diff --git a/ag/char_overview.php b/ag/char_overview.php
index 1172f73..cbc8f95 100644
--- a/ag/char_overview.php
+++ b/ag/char_overview.php
@@ -52,25 +52,28 @@ foreach($chars as $my_charz){
 
 	$temproom="<br><a href=index.php?as=clan/c_ware&char_id=$my_charz[id] id=popup> Trainingsraum: ".$clanroom['name']."</a>";
 
-	$hp = "HP: ".$hptemp['0']." / ".$hptemp['1'].' (+'.$char1_buffs['hp'].')';;
+	
 	if($my_charz['status'] == "Schatz Suche")
 	$statustemp = "Schatz%20Suche";
 	else
 	$statustemp = $my_charz['status'];
-
+		
 
 	if($my_charz['kampf_item'] != NULL && $my_charz['kampf_item'] != ',,,,'){
 		//		echo 'Problematic Entry = '.$chara_1['kampf_item'].'<br>';
 		$char1_buffs = mysql_fetch_assoc(mysql_query('SELECT sum(i.hp) as hp, sum(i.mp) as mp, sum(i.starke) as starke, sum(i.verteidigung) as verteidigung, sum(i.speed) as speed FROM ware w LEFT JOIN item i ON(i.id=w.item_id) WHERE w.id IN (' . $my_charz['kampf_item'] . ')'));
 	}
-	$c_starke = $char1_buffs['starke']==0?$my_charz['starke']:($my_charz['starke']).' (+'.$char1_buffs['starke'].')';
-	$c_verteidigung = $char1_buffs['verteidigung']==0?$my_charz['verteidigung']:($my_charz['verteidigung']).' (+'.$char1_buffs['verteidigung'].')';
-	$c_speed = $char1_buffs['speed']==0?$my_charz['speed']:($my_charz['speed']).' (+'.$char1_buffs['speed'].')';
-	$c_ausdauer = $char1_buffs['ausdauer']==0?$my_charz['ausdauer']:($my_charz['ausdauer']).' (+'.$char1_buffs['ausdauer'].')';
-	$c_glueck = $char1_buffs['glueck']==0?$my_charz['glueck']:($my_charz['glueck']).' (+'.$char1_buffs['glueck'].')';
-
-	$mp = "MP: ".$mptemp['0']." / ".$mptemp['1'].' (+'.$char1_buffs['mp'].')';;
-	$exp = "Exp: ".$exptemp['0']." / ".$exptemp['1'];
+	$c_starke = ($char1_buffs['starke']==0)?$my_charz['starke']:($my_charz['starke']).' (+'.$char1_buffs['starke'].')';
+	$c_verteidigung = ($char1_buffs['verteidigung']==0)?$my_charz['verteidigung']:($my_charz['verteidigung']).' (+'.$char1_buffs['verteidigung'].')';
+	$c_speed = ($char1_buffs['speed']==0)?$my_charz['speed']:($my_charz['speed']).' (+'.$char1_buffs['speed'].')';
+	$c_ausdauer = ($char1_buffs['ausdauer']==0)?$my_charz['ausdauer']:($my_charz['ausdauer']).' (+'.$char1_buffs['ausdauer'].')';
+	$c_glueck = ($char1_buffs['glueck']==0)?$my_charz['glueck']:($my_charz['glueck']).' (+'.$char1_buffs['glueck'].')';
+	
+	
+	$hp = ($char1_buffs['hp']==0)?("HP: ".$hptemp[0]." / ".$hptemp[1]):("HP: ".$hptemp[0]." / ".$hptemp[1].' (+'.$char1_buffs['hp'].')');
+	$mp = ($char1_buffs['mp']==0)?("MP: ".$mptemp[0]." / ".$mptemp[1]):("MP: ".$mptemp[0]." / ".$mptemp[1].' (+'.$char1_buffs['mp'].')');
+	//$mp = "MP: ".$mptemp[0]." / ".$mptemp[1].' (+'.$char1_buffs['mp'].')';
+	$exp = "Exp: ".$exptemp[0]." / ".$exptemp[1];
 	if($my_charz['status'] == 'Frei' ){
 		$temp = 'Status: '.$my_charz['status'];
 	} elseif($my_charz['status'] == 'Angemeldet' OR $my_charz['status'] == 'Kampf erstellt') {
diff --git a/ag/char_profil.php b/ag/char_profil.php
index aae8110..24e8957 100644
--- a/ag/char_profil.php
+++ b/ag/char_profil.php
@@ -123,14 +123,14 @@ function stelledar($char_id,$user_ida,$name) {
 			</tr>
 			<tr>
 				<td width="192" height="25"><b>HP</b>
-				</td>
-				<td width="392" height="25">&nbsp;<?php echo ''.$hp1[0].' / '.$hp1[1].' ';  ?>
+				</td> 
+				<td width="392" height="25">&nbsp;<?php echo ($buffedstats['hp']==0)?($hp1[0].' / '.$hp1[1]):($hp1[0].' / '.$hp1[1].' (+'.$buffedstats['hp'].' R&uuml;stungsbonus)'); ?>
 				</td>
 			</tr>
 			<tr>
 				<td width="192" height="25"><b>MP</b>
 				</td>
-				<td width="392" height="25">&nbsp;<?php echo ''.$mp1[0].' / '.$mp1[1].'' ?>
+				<td width="392" height="25">&nbsp;<?php echo ($buffedstats['mp']==0)?($mp1[0].' / '.$mp1[1]):($mp1[0].' / '.$mp1[1].' (+'.$buffedstats['mp'].' R&uuml;stungsbonus)'); ?>
 				</td>
 			</tr>
 			<tr>