diff --git a/e107_plugins/faqs/admin_config.php b/e107_plugins/faqs/admin_config.php
index 14ca9fb0f..1301fa218 100644
--- a/e107_plugins/faqs/admin_config.php
+++ b/e107_plugins/faqs/admin_config.php
@@ -209,9 +209,11 @@ class faq_main_ui extends e_admin_ui
 		
 		// optional, if $pluginName == 'core', core prefs will be used, else e107::getPluginConfig($pluginName);
 		protected $prefs = array( 
-			'add_faq'	   				=> array('title'=> LANA_FAQ_PREF_1, 'type'=>'userclass', 'help' => 'Under construction'),
-			'submit_question'	   		=> array('title'=> LANA_FAQ_PREF_2, 'type'=>'userclass', 'help' => 'Under construction'),		
-			'classic_look'				=> array('title'=> LANA_FAQ_PREF_3, 'type'=>'boolean', 'help' => 'Under construction')
+			'add_faq'	   				=> array('title'=> LANA_FAQ_PREF_1, 'type'=>'userclass' ),
+			'submit_question'	   		=> array('title'=> LANA_FAQ_PREF_2, 'type'=>'userclass' ),
+			'submit_question_limit'     => array('title'=> "'Ask a Question' limit per user", 'type'=>'number', 'data'=>'int', 'help'=>'0 = no limit'),
+			'classic_look'				=> array('title'=> LANA_FAQ_PREF_3, 'type'=>'boolean' ),
+
 		);
 
 	protected $categories = array();
@@ -240,6 +242,8 @@ class faq_main_ui extends e_admin_ui
 			$new_data['faq_tags'] = implode(',', array_map('trim', explode(',', $new_data['faq_tags'])));
 		}
 
+		$new_data['faq_order'] = 0;
+
 		return $new_data;
 	}
 	
diff --git a/e107_plugins/faqs/faqs.php b/e107_plugins/faqs/faqs.php
index 07bb1ff31..f032c9a56 100644
--- a/e107_plugins/faqs/faqs.php
+++ b/e107_plugins/faqs/faqs.php
@@ -204,9 +204,11 @@ class faq
 		{
 			$sql = e107::getDb();
 
-			if($sql->select('faqs','faq_id',"faq_answer='' AND faq_author_ip = '".USERIP."' LIMIT 1"))
+			$existing = $sql->select('faqs','faq_id',"faq_answer='' AND faq_author_ip = '".USERIP."' ");
+
+			if(!empty($this->pref['submit_question_limit']) && $existing >= $this->pref['submit_question_limit'])
 			{
-				e107::getMessage()->setTitle('Sorry',E_MESSAGE_INFO)->addInfo("You may only ask another question once your other question has been answered.");
+				e107::getMessage()->setTitle('Sorry',E_MESSAGE_INFO)->addInfo("You have reached the maximum number of new questions. You may ask more once your existing questions have been answered.");
 				return;
 			}
 
diff --git a/e107_plugins/faqs/languages/English/English_admin.php b/e107_plugins/faqs/languages/English/English_admin.php
index cc1f19439..cc398c2cc 100644
--- a/e107_plugins/faqs/languages/English/English_admin.php
+++ b/e107_plugins/faqs/languages/English/English_admin.php
@@ -19,5 +19,5 @@ define('LANA_FAQ_METAD', 'Meta Description');
 define('LANA_FAQ_METAK', 'Meta Keywords');
 
 define('LANA_FAQ_PREF_1', 'Allow submitting of FAQs by:');
-define('LANA_FAQ_PREF_2', 'Allow submitting of Questions by:');
+define('LANA_FAQ_PREF_2', "'Ask a Question' is limited to");
 define('LANA_FAQ_PREF_3', 'Use Classic Layout');
diff --git a/e107_plugins/faqs/plugin.xml b/e107_plugins/faqs/plugin.xml
index cbabfe05f..c380d4940 100644
--- a/e107_plugins/faqs/plugin.xml
+++ b/e107_plugins/faqs/plugin.xml
@@ -20,6 +20,7 @@
 	<pluginPrefs>
 		<pref name="add_faq">255</pref>
 		<pref name="submit_question">255</pref>
+        <pref name="submit_question_limit">3</pref>
 		<pref name="classic_look">0</pref>
 	</pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/tinymce4/wysiwyg.php b/e107_plugins/tinymce4/wysiwyg.php
index 9b503b9bf..521fa22a5 100644
--- a/e107_plugins/tinymce4/wysiwyg.php
+++ b/e107_plugins/tinymce4/wysiwyg.php
@@ -238,6 +238,11 @@ class wysiwyg
 		{
 			return $string;
 		}
+
+		if(is_numeric($string))
+		{
+			return $string;
+		}
 	
 		if(is_string($string))
 		{
@@ -325,6 +330,7 @@ class wysiwyg
 		$ret['preformatted']			= true;
 		$ret['document_base_url']		= SITEURL;
 
+
 	//	$ret['table_default_attributes'] = json_encode(array('class'=>'table table-striped' ));