diff --git a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
index 155608c2c..e518b11ea 100644
--- a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
@@ -47,10 +47,10 @@
 				}
 		}
 		$('#active_on').bind('click', function(){
-			toggleDraftWarning(true);
+			toggleDraftWarning(false);
 		});
 		$('#active_off').bind('click', function(){
-			toggleDraftWarning(false);
+			toggleDraftWarning(true);
 		});		
 	});
 {/block}
diff --git a/classes/Link.php b/classes/Link.php
index dc4fca3d3..b6285040e 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -209,8 +209,16 @@ class LinkCore
 		$params = array();
 		$params['id'] = $cms->id;
 		$params['rewrite'] = (!$alias) ? $cms->link_rewrite : $alias;
-		$params['meta_keywords'] =	Tools::str2url($cms->meta_keywords);
-		$params['meta_title'] = Tools::str2url($cms->meta_title);
+
+        if (isset($cms->meta_keywords[$id_lang]) && !empty($cms->meta_keywords[$id_lang]))
+            $params['meta_keywords'] = Tools::str2url($cms->meta_keywords[$id_lang]);
+        else
+            $params['meta_keywords'] = '';
+
+        if (isset($cms->meta_title[$id_lang]) && !empty($cms->meta_title[$id_lang]))
+            $params['meta_title'] = Tools::str2url($cms->meta_title[$id_lang]);
+        else
+            $params['meta_title'] = '';
 
 		return $url.Dispatcher::getInstance()->createUrl('cms_rule', $params, $this->allow);
 	}
diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php
index 1bc15e6e7..9a8bdff30 100644
--- a/controllers/admin/AdminCmsController.php
+++ b/controllers/admin/AdminCmsController.php
@@ -277,22 +277,6 @@ class AdminCmsControllerCore extends AdminController
 						$this->errors[] = Tools::displayError('An error occurred while creating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
 					else
 						$this->updateAssoShop($cms->id);
-					if (Tools::isSubmit('submitAddcmsAndPreview'))
-					{
-						$preview_url = $this->context->link->getCMSLink($cms, $this->getFieldValue($cms, 'link_rewrite', $this->context->language->id), $this->context->language->id);
-
-						if (!$cms->active)
-						{
-							$admin_dir = dirname($_SERVER['PHP_SELF']);
-							$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
-							$token = Tools::encrypt('PreviewCMS'.$cms->id);
-
-							$preview_url .= $cms->active ? '' : '&adtoken='.$token.'&ad='.$admin_dir;
-						}
-						Tools::redirectAdmin($preview_url);
-					}
-					else
-						Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=3&token='.Tools::getAdminTokenLite('AdminCmsContent'));
 				}
 				else
 				{
@@ -302,22 +286,25 @@ class AdminCmsControllerCore extends AdminController
 						$this->errors[] = Tools::displayError('An error occurred while updating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
 					else
 						$this->updateAssoShop($cms->id);
-					if (Tools::isSubmit('submitAddcmsAndPreview'))
-					{
-						$preview_url = $this->context->link->getCMSLink($cms, $this->getFieldValue($object, 'link_rewrite', $this->context->language->id), $this->context->language->id);
-						if (!$cms->active)
-						{
-							$admin_dir = dirname($_SERVER['PHP_SELF']);
-							$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
-							$token = Tools::encrypt('PreviewCMS'.$cms->id);
 
-							$preview_url .= $object->active ? '' : '&adtoken='.$token.'&ad='.$admin_dir;
-						}
-						Tools::redirectAdmin($preview_url);
-					}
-					else
-						Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=4&token='.Tools::getAdminTokenLite('AdminCmsContent'));
 				}
+                if (Tools::isSubmit('submitAddcmsAndPreview'))
+                {
+                    $alias = $this->getFieldValue($cms, 'link_rewrite', $this->context->language->id);
+                    $preview_url = $this->context->link->getCMSLink($cms, $alias, $this->context->language->id);
+
+                    if (!$cms->active)
+                    {
+                        $admin_dir = dirname($_SERVER['PHP_SELF']);
+                        $admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
+                        $token = Tools::encrypt('PreviewCMS'.$cms->id);
+
+                        $preview_url .= $object->active ? '' : '&adtoken='.$token.'&ad='.$admin_dir;
+                    }
+                    Tools::redirectAdmin($preview_url);
+                }
+                else
+                    Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=4&token='.Tools::getAdminTokenLite('AdminCmsContent'));
 			}
 		}
 		elseif (Tools::getValue('position'))