diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 6434d08c0..fc8660ce2 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -600,7 +600,9 @@ class page_admin_ui extends e_admin_ui
 			'page_password' 	=> array('title'=> LAN_PASSWORD, 		'tab' => 1, 'type' => 'text', 	'data'=>'str', 'width' => 'auto', 'writeParms'=>array('password'=>1, 'nomask'=>1, 'size' => 40, 'class' => 'tbox e-password', 'generate' => 1, 'strength' => 1, 'required'=>0)),								
 			'page_sef' 			=> array('title'=> LAN_SEFURL, 		'tab' => 1,	'type' => 'text', 'batch'=>true,	'data'=>'str', 'inline'=>true, 'width' => 'auto', 'writeParms'=>'size=xxlarge&sef=page_title'),
 			'page_metakeys' 	=> array('title'=> LAN_KEYWORDS, 		'tab' => 1,	'type' => 'tags', 	'data'=>'str', 'width' => 'auto'),
-			'page_metadscr' 	=> array('title'=> CUSLAN_11, 		'tab' => 1,	'type' => 'textarea', 	'data'=>'str', 'width' => 'auto', 'writeParms'=>array('size'=>'xxlarge', 'rows'=>2, 'maxlength'=>155)),
+			'page_metadscr' 	=> array('title'=> CUSLAN_11, 		'tab' => 1,	'type' => 'textarea', 	'data'=>'str', 'help'=>CUSLAN_82, 'width' => 'auto', 'writeParms'=>array('size'=>'xxlarge', 'rows'=>2, 'maxlength'=>155)),
+			'page_metaimage' 	=> array('title'=> CUSLAN_81, 		 'nolist'=>false, 'tab' => 1,	'type' => 'image', 'help'=> CUSLAN_82, 		'width' => '110px',	'thclass' => 'center', 			'class' => "center", 'nosort' => false, 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60','writeParms'=>'media=page^&video=1', 'readonly'=>false),
+
 			'page_metarobots'		=> array('title' => LAN_ROBOTS, 'tab'=>1,	'type' => 'dropdown',  'data'=>'safestr', 'batch'=>true,   'inline'=>true, 'readParms'=>array('type'=>'checkboxes'), 'width' => 'auto', 	'thclass' => 'left', 			'class' => 'left', 		'nosort' => false, 'filter'=>true),
 
 			'page_order' 		=> array('title'=> LAN_ORDER, 		'tab' => 1,	'type' => 'number', 'width' => 'auto', 'inline'=>true),
diff --git a/e107_core/sql/core_sql.php b/e107_core/sql/core_sql.php
index eb60437fb..cfb483cd3 100755
--- a/e107_core/sql/core_sql.php
+++ b/e107_core/sql/core_sql.php
@@ -383,6 +383,7 @@ CREATE TABLE page (
   page_chapter int(10) unsigned NOT NULL default '0',
   page_metakeys varchar (250) NOT NULL default '',
   page_metadscr mediumtext,
+  page_metaimage varchar (250) NOT NULL default '',
   page_metarobots varchar (250) default '',
   page_text mediumtext,
   page_author int(10) unsigned NOT NULL default '0',
diff --git a/e107_handlers/e_customfields_class.php b/e107_handlers/e_customfields_class.php
index 0dbe17534..fd7a531aa 100644
--- a/e107_handlers/e_customfields_class.php
+++ b/e107_handlers/e_customfields_class.php
@@ -22,7 +22,7 @@
 
 		private $_data = array();
 
-		private $_field_limit = 20;
+		private $_field_limit = 30;
 
 		private $_tab = array();
 
diff --git a/e107_languages/English/admin/lan_cpage.php b/e107_languages/English/admin/lan_cpage.php
index 91d3e68a3..17d906545 100644
--- a/e107_languages/English/admin/lan_cpage.php
+++ b/e107_languages/English/admin/lan_cpage.php
@@ -51,6 +51,8 @@ define("CUSLAN_77", "deleted");
 define("CUSLAN_78", "Couldn't delete menu with path ");
 define("CUSLAN_79", "You must enter either a page title or a menu name.");
 define("CUSLAN_80", "Sub Title");
+define("CUSLAN_81", "Meta image");
+define("CUSLAN_82", "Optional. Used by social media when sharing this page.");
 
 
 
diff --git a/page.php b/page.php
index f4330fb83..c3895c504 100644
--- a/page.php
+++ b/page.php
@@ -738,7 +738,10 @@ class pageClass
 
 		e107::title(eHelper::formatMetaTitle($this->page['page_title']));
 
-		if($this->page['page_metadscr']) define('META_DESCRIPTION', eHelper::formatMetaDescription($this->page['page_metadscr']));
+
+
+
+
 		if(!empty($this->page['page_metakeys']))
 		{
 			e107::meta('keywords', eHelper::formatMetaKeys($this->page['page_metakeys']));
@@ -749,11 +752,23 @@ class pageClass
 			e107::meta('robots', $this->page['page_metarobots']);
 		}
 
+		if($this->page['page_metadscr'])
+		{
+			$metaDiz = eHelper::formatMetaDescription($this->page['page_metadscr']);
+			define('META_DESCRIPTION', $metaDiz);
+			e107::meta('og:description', $metaDiz);
+		}
+
 		$tp = e107::getParser();
 
-		if($tp->isImage($this->page['menu_image']))
+		if($tp->isImage($this->page['page_metaimage']))
 		{
-			$mimg = $tp->thumbUrl($this->page['menu_image'],'w=800', false, true);
+			$mimg = $tp->thumbUrl($this->page['page_metaimage'],'w=1200', false, true);
+			e107::meta('og:image',$mimg);
+		}
+		elseif($tp->isImage($this->page['menu_image']))
+		{
+			$mimg = $tp->thumbUrl($this->page['menu_image'],'w=1200', false, true);
 			e107::meta('og:image',$mimg);
 		}