diff --git a/common/js/plugins/ui/rx_datepicker.js b/common/js/plugins/ui/rx_datepicker.js
index 8c9c4d455..6673acea1 100644
--- a/common/js/plugins/ui/rx_datepicker.js
+++ b/common/js/plugins/ui/rx_datepicker.js
@@ -3,5 +3,11 @@
  * @author MinSoo Kim <misol.kr@gmail.com>
  **/
 if(typeof current_lang !== "undefined" && current_lang !== 'en') {
-	jQuery.getScript(request_uri + "./common/js/plugins/ui/i18n/datepicker-"+ current_lang.replace("jp", "ja") +".js");
+	jQuery.getScript(request_uri + "./common/js/plugins/ui/i18n/datepicker-"+ current_lang.replace("jp", "ja") +".js", function() {
+		var default_option = {
+			dateFormat:'yy-mm-dd'
+		};
+		jQuery.extend(jQuery.datepicker.regional[current_lang.replace("jp", "ja")],default_option);
+		jQuery.datepicker.setDefaults( datepicker.regional[current_lang.replace("jp", "ja")] );
+	});
 }
\ No newline at end of file
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 662befbf1..b3ccc9b2d 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -20,7 +20,7 @@
 			<label for="" class="x_control-label">{$lang->poll_stop_date}</label>
 			<div class="x_controls">
 				<input type="hidden" name="stop_date" id="stop_date" value="{date('Ymd',time()+60*60*24*30)}" />
-				<input type="date" class="inputDate" min="{date('Y-m-d',time())}"  max="{date('Y-m-d',strtotime('+10 years'))}" onchange="jQuery('#stop_date').val(this.value.replace(/-/g,''));" value="{date('Y-m-d',time()+60*60*24*30)}" />
+				<input type="date" class="inputDate" min="{date('Y-m-d',time())}"  max="{date('Y-m-d',strtotime('+10 years'))}" onchange="$('#stop_date').val($.datepicker.formatDate('yymmdd', new Date(this.value)));" value="{date('Y-m-d',time()+60*60*24*30)}" />
 <script>
 (function($){
 $(function(){
@@ -32,7 +32,7 @@ $(function(){
 			,gotoCurrent: false
 			,yearRange:'-100:+10'
 			, onSelect:function(){
-				$('#stop_date').val(this.value.replace(/-/g,""));
+				$('#stop_date').val($.datepicker.formatDate('yymmdd', $(this).datepicker( "getDate" )));
 			}
 			,defaultDate: new Date("{date('Y-m-d',time()+60*60*24*30)}")
 			,minDate: new Date("{date('Y-m-d',time())}")
@@ -41,6 +41,9 @@ $(function(){
 		//if the browser does not support type date input, start datepicker. If it does, brower's UI will show their datepicker.
 		$(".inputDate").datepicker(option);
 	}
+	else
+	{
+	}
 });
 })(jQuery);
 </script>