diff --git a/ChangeLog b/ChangeLog
index 6c00f9abb..c104ddb5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $HeadURL$
 - bug #1733012 Unwanted table alias in delete button
 - bug #1736405 Pretty printer and HTML line breaks
 - bug #1745257 Invalid DB name is still displayed
+- bug #1730367 Calendar "Go" has no effect
 
 2.10.2.0 (2007-06-15)
 
diff --git a/calendar.php b/calendar.php
index 4c8b1a71d..7cbef8f56 100644
--- a/calendar.php
+++ b/calendar.php
@@ -11,7 +11,7 @@ require('./libraries/header_meta_style.inc.php');
 //<![CDATA[
 var month_names = new Array("<?php echo implode('","', $month); ?>");
 var day_names = new Array("<?php echo implode('","', $day_of_week); ?>");
-var submit_text = "<?php echo $strGo; ?>";
+var submit_text = "<?php echo $strGo . ' (' . $strTime . ')'; ?>";
 //]]>
 </script>
 </head>
diff --git a/js/tbl_change.js b/js/tbl_change.js
index beeb14838..6ee401028 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -180,6 +180,7 @@ function initCalendar() {
                 second      = parseInt(value.substr(12,2),10);
             }
         }
+
         if (isNaN(year) || isNaN(month) || isNaN(day) || day == 0) {
             dt      = new Date();
             year    = dt.getFullYear();
@@ -300,13 +301,15 @@ function initCalendar() {
         init_hour = hour;
         init_minute = minute;
         init_second = second;
+        str += '<fieldset>';
         str += '<form method="NONE" class="clock" onsubmit="returnDate(\'' + current_date + '\')">';
         str += '<input id="hour"    type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_hour, \'hour\'); init_hour = this.value;" value="' + formatNum2(hour, 'hour') + '" />:';
         str += '<input id="minute"  type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_minute, \'minute\'); init_minute = this.value;" value="' + formatNum2(minute, 'minute') + '" />:';
         str += '<input id="second"  type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_second, \'second\'); init_second = this.value;" value="' + formatNum2(second, 'second') + '" />';
-        str += '<br />';
+        str += '&nbsp;&nbsp;';
         str += '<input type="submit" value="' + submit_text + '"/>';
         str += '</form>';
+        str += '</fieldset>';
 
         cnt.innerHTML = str;
         clock_set = 1;