diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml
index 449b989dc..93c9d55d8 100644
--- a/modules/document/conf/module.xml
+++ b/modules/document/conf/module.xml
@@ -52,7 +52,7 @@
         <action name="procDocumentAdminRestoreTrash" type="controller" standalone="true" />
         <action name="procDocumentAdminMoveExtraVar" type="controller" standalone="true" />
 
-        <action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" />
+        <action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" ruleset="insertExtraVar" />
         <action name="procDocumentAdminDeleteExtraVar" type="controller" standalone="true" />
         <action name="procDocumentAdminDeleteChecked" type="controller" standalone="true" />
         <action name="procDocumentAdminInsertConfig" type="controller" standalone="true" />
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index 76590be7c..8560cfb8d 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -410,6 +410,11 @@
             if(!$output->toBool()) return $output;
 
             $this->setMessage('success_registed');
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
         }
 
         /**
diff --git a/modules/document/queries/insertDocumentExtraKey.xml b/modules/document/queries/insertDocumentExtraKey.xml
index 8bf33a63f..47d9229b2 100644
--- a/modules/document/queries/insertDocumentExtraKey.xml
+++ b/modules/document/queries/insertDocumentExtraKey.xml
@@ -9,8 +9,8 @@
         <column name="var_type" var="var_type" notnull="notnull" />
         <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
         <column name="var_search" var="var_search" default="N" notnull="notnull" />
-        <column name="var_default" var="var_default" notnull="notnull" />
-        <column name="var_desc" var="var_desc" notnull="notnull" />
+        <column name="var_default" var="var_default" />
+        <column name="var_desc" var="var_desc" />
         <column name="eid" var="eid" notnull="notnull" />
     </columns>
 </query>
diff --git a/modules/document/queries/updateDocumentExtraKey.xml b/modules/document/queries/updateDocumentExtraKey.xml
index 3c25dba8e..fb45dc769 100644
--- a/modules/document/queries/updateDocumentExtraKey.xml
+++ b/modules/document/queries/updateDocumentExtraKey.xml
@@ -7,8 +7,8 @@
         <column name="var_type" var="var_type" notnull="notnull" />
         <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
         <column name="var_search" var="var_search" default="N" notnull="notnull" />
-        <column name="var_default" var="var_default" default="" />
-        <column name="var_desc" var="var_desc" default="" />
+        <column name="var_default" var="var_default" />
+        <column name="var_desc" var="var_desc" />
         <column name="eid" var="eid" notnull="notnull" />
     </columns>
     <conditions>
diff --git a/modules/document/queries/updateDocumentExtraVar.xml b/modules/document/queries/updateDocumentExtraVar.xml
index 4edc3501f..58050bbb2 100644
--- a/modules/document/queries/updateDocumentExtraVar.xml
+++ b/modules/document/queries/updateDocumentExtraVar.xml
@@ -3,7 +3,7 @@
         <table name="document_extra_vars" />
     </tables>
     <columns>
-        <column name="value" var="value" notnull="notnull" />
+        <column name="value" var="value" />
         <column name="lang_code" var="lang_code" />
         <column name="eid" var="eid" />
     </columns>
diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
index 78676207d..5617adee6 100644
--- a/modules/document/tpl/extra_keys.html
+++ b/modules/document/tpl/extra_keys.html
@@ -6,16 +6,21 @@
 <!--@if($selected_var_idx && $extra_keys[$selected_var_idx])-->
     {@ $selected_var = $extra_keys[$selected_var_idx] }
 <!--@end-->
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
 
 <!--@if($type == 'insertExtraForm' || $selected_var_idx)-->
-    <form action="./" method="post" onsubmit="return procFilter(this, insert_extra_var)">
+    <form ruleset="insertExtraVar" action="./" method="post">
+    <input type="hidden" name="act" value="procDocumentAdminInsertExtraVar" />
     <input type="hidden" name="module_srl" value="{$module_srl}" />
     <input type="hidden" name="var_idx" value="{$selected_var_idx}" />
+    <input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', $act, 'module_srl', $module_srl)}" />
 
         <h4 class="xeAdmin">{$lang->extra_vars} {$selected_var_idx}</h4>
         <table cellspacing="0" class="crossTable ">
         <tr>
-            <th><div>thisthis{$lang->eid}</div></th>
+            <th><div>{$lang->eid}</div></th>
             <td class="wide">
                 <input type="text" name="eid" value="{$selected_var->eid}" class="inputTypeText w200" id="eid" /><p>{$lang->about_extra_vars_eid_value}</p>
             </td>
@@ -119,4 +124,4 @@
 <form id="fo_delete" name="fo_delete" method="post" action="./">
 <input type="hidden" name="module_srl" value="" />
 <input type="hidden" name="var_idx" value="" />
-<form>
+</form>
diff --git a/modules/module/tpl/js/multilingual.js b/modules/module/tpl/js/multilingual.js
index ef600e83b..530f15a15 100644
--- a/modules/module/tpl/js/multilingual.js
+++ b/modules/module/tpl/js/multilingual.js
@@ -44,3 +44,12 @@ $('#langList')
 	})
 
 });
+
+function doInsertLangCode(langCode, target)
+{
+    if(window.opener && target) {
+        var obj = window.opener.get_by_id(target);
+        if(obj) obj.value = '$user_lang->'+langCode;
+    }
+    window.close();
+}
diff --git a/modules/module/tpl/module_langcode.html b/modules/module/tpl/module_langcode.html
index 03ad55ba7..b8d387573 100644
--- a/modules/module/tpl/module_langcode.html
+++ b/modules/module/tpl/module_langcode.html
@@ -11,7 +11,7 @@
 	<ul id="langList">
 		<li loop="$lang_code_list=>$key,$value">
 		{@$langName = $value->name}
-		<strong>{$value->value}</strong> <button type="button" class="side text _edit">{$lang->cmd_edit}</button>
+		<strong>{$value->value}</strong> <span class="side"><button type="button" class="text" cond="$module != 'admin'" onclick="doInsertLangCode('{$value->name}', '{$target}')">{$lang->cmd_apply}</button><button type="button" class="text _edit">{$lang->cmd_edit}</button></span>
 		<form action="./" method="post" id="langForm_{$langName}" >
 			<input type="hidden" name="act" value="procModuleAdminInsertLang" />
 			<input type="hidden" name="lang_name" value="{$langName}" />