diff --git a/e107_core/bbcodes/bb_p.php b/e107_core/bbcodes/bb_p.php
index ee6827db0..8b6d18e2b 100644
--- a/e107_core/bbcodes/bb_p.php
+++ b/e107_core/bbcodes/bb_p.php
@@ -60,7 +60,8 @@ class bb_p extends e_bb_base
 
 		$parms = eHelper::scParams($parm);
 				
-		$class = " ".e107::getBB()->getClass('p'); // consistent classes across all themes. 
+		$class = vartrue($parms['class']) ? ' class="'.eHelper::secureClassAttr($parms['class']).' ' : ' class="';
+		$class .= e107::getBB()->getClass('p').'"'; // consistent classes across all themes.
 		
 		$id = vartrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : '';
 		$style = vartrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';