diff --git a/classes/Validate.php b/classes/Validate.php
index 588ae22e5..61e0b403f 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -366,7 +366,7 @@ class ValidateCore
 	 */
 	public static function isGenericName($name)
 	{
-		return empty($name) || preg_match('/^[^<>;=#{}]*$/u', $name);
+		return empty($name) || preg_match('/^[^<>=#{}]*$/u', $name);
 	}
 
 	/**
diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
index cf672e45f..e486325ab 100644
--- a/controllers/admin/AdminFeaturesController.php
+++ b/controllers/admin/AdminFeaturesController.php
@@ -404,7 +404,9 @@ class AdminFeaturesControllerCore extends AdminController
 
 		if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors))
 			$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'=&conf=3&update'.$this->table.'&token='.$this->token;
-			
+		else if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && count($this->errors))
+			$this->display = 'editFeatureValue';
+
 		return $object;
 	}