diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
index 551e53e3c..b510c8daf 100644
--- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
@@ -164,6 +164,10 @@ class forum_shortcodes extends e_shortcode
 		  return $text;
 	}
 
+	/**
+	 * @example {SEARCH: placeholder=Search forums} - sets placeholder 'Search forums'
+	 * @example {SEARCH: buttonclass=btn btn-small} - sets button class 'btn btn-small'
+	*/
 	function sc_search($parm=null)
 	{
 
@@ -172,8 +176,8 @@ class forum_shortcodes extends e_shortcode
 			$srchIcon = LAN_SEARCH;
 		}
 
-		$buttonclass = (!empty($parm['buttonclass'])) ? "class='".$parm['buttonclass']."'" : "class='btn btn-default btn-secondary button'";
-
+		$buttonclass 	= (!empty($parm['buttonclass'])) ? "class='".$parm['buttonclass']."'" : "class='btn btn-default btn-secondary button'";
+		$placeholder    = (!empty($parm['placeholder'])) ? $parm['placeholder'] : LAN_SEARCH;
 
 		// String candidate for USERLIST wrapper
 		return "
@@ -182,7 +186,7 @@ class forum_shortcodes extends e_shortcode
 		<input type='hidden' name='r' value='0' />
 		<input type='hidden' name='t' value='forum' />
 		<input type='hidden' name='forum' value='all' />
-		<input class='tbox form-control' type='text' name='q' size='20' value='' maxlength='50' />
+		<input class='tbox form-control' type='text' name='q' size='20' value='' placeholder='".$placeholder."' maxlength='50' />
 		<span class='input-group-btn'>
 		<button ".$buttonclass." type='submit' name='s' value='search' >".$srchIcon."</button>
 		</span>
diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
index 631b59023..dd5c274cb 100644
--- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
@@ -306,7 +306,10 @@
 			return empty($viewable) ? '' : $viewable;
 		}
 
-
+		/**
+		 * @example {SEARCH: placeholder=Search forums} - sets placeholder 'Search forums'
+		 * @example {SEARCH: buttonclass=btn btn-small} - sets button class 'btn btn-small'
+		*/
 		function sc_search($parm=null)
 		{
 
@@ -315,8 +318,8 @@
 				$srchIcon = LAN_SEARCH;
 			}
 
-			$buttonclass = (!empty($parm['buttonclass'])) ? "class='".$parm['buttonclass']."'" : "class='btn btn-default btn-secondary button'";
-
+			$buttonclass 	= (!empty($parm['buttonclass'])) ? "class='".$parm['buttonclass']."'" : "class='btn btn-default btn-secondary button'";
+			$placeholder    = (!empty($parm['placeholder'])) ? $parm['placeholder'] : LAN_SEARCH;
 
 			// String candidate for USERLIST wrapper
 			return "
@@ -325,7 +328,7 @@
 			<input type='hidden' name='r' value='0' />
 			<input type='hidden' name='t' value='forum' />
 			<input type='hidden' name='forum' value='all' />
-			<input class='tbox form-control' type='text' name='q' size='20' value='' maxlength='50' />
+			<input class='tbox form-control' type='text' name='q' size='20' value='' placeholder='".$placeholder."' maxlength='50' />
 			<span class='input-group-btn'>
 			<button ".$buttonclass." type='submit' name='s' value='search' >".$srchIcon."</button>
 			</span>