diff --git a/calendar/templates/default/footer.tpl b/calendar/templates/default/footer.tpl
index 4d23242602..4fb9ad79e0 100755
--- a/calendar/templates/default/footer.tpl
+++ b/calendar/templates/default/footer.tpl
@@ -22,5 +22,10 @@
 	  </font>
 	 </td>
 <!-- END footer_row -->
+<!-- BEGIN blank_row -->
+         <td>
+          {b_row}
+         </td>
+<!-- END blank_row -->
 
 
diff --git a/calendar/templates/default/header.inc.php b/calendar/templates/default/header.inc.php
index 6f8b08a7ec..2d3c548d6b 100755
--- a/calendar/templates/default/header.inc.php
+++ b/calendar/templates/default/header.inc.php
@@ -146,9 +146,9 @@
 	{
 		$hidden_vars .= '    <input type="hidden" name="date" value="'.$HTTP_GET_VARS['date'].'">'."\n";
 	}
-	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->so->month.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->so->day.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->so->year.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n";
 	if(isset($this->bo->filter) && $this->bo->filter)
 	{
 		$hidden_vars .= '    <input type="hidden" name="filter" value="'.$this->bo->filter.'">'."\n";
diff --git a/calendar/templates/default/vcal_import.tpl b/calendar/templates/default/vcal_import.tpl
new file mode 100755
index 0000000000..f13c56caa3
--- /dev/null
+++ b/calendar/templates/default/vcal_import.tpl
@@ -0,0 +1,10 @@
+<!-- vcardin form -->
+{vcal_header}
+    <form ENCTYPE="multipart/form-data" method="POST" action="{action_url}">
+      <table border=0>
+      <tr>
+       <td>(i/v)Cal: <input type="file" name="uploadedfile"></td>
+       <td><input type="submit" name="action" value="{load_vcal}"></td>
+      </tr>
+      </table>
+     </form>
diff --git a/calendar/templates/idsociety/header.inc.php b/calendar/templates/idsociety/header.inc.php
index 6f8b08a7ec..2d3c548d6b 100755
--- a/calendar/templates/idsociety/header.inc.php
+++ b/calendar/templates/idsociety/header.inc.php
@@ -146,9 +146,9 @@
 	{
 		$hidden_vars .= '    <input type="hidden" name="date" value="'.$HTTP_GET_VARS['date'].'">'."\n";
 	}
-	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->so->month.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->so->day.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->so->year.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n";
 	if(isset($this->bo->filter) && $this->bo->filter)
 	{
 		$hidden_vars .= '    <input type="hidden" name="filter" value="'.$this->bo->filter.'">'."\n";
diff --git a/calendar/templates/justweb/header.inc.php b/calendar/templates/justweb/header.inc.php
index 6f8b08a7ec..2d3c548d6b 100755
--- a/calendar/templates/justweb/header.inc.php
+++ b/calendar/templates/justweb/header.inc.php
@@ -146,9 +146,9 @@
 	{
 		$hidden_vars .= '    <input type="hidden" name="date" value="'.$HTTP_GET_VARS['date'].'">'."\n";
 	}
-	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->so->month.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->so->day.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->so->year.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n";
 	if(isset($this->bo->filter) && $this->bo->filter)
 	{
 		$hidden_vars .= '    <input type="hidden" name="filter" value="'.$this->bo->filter.'">'."\n";
diff --git a/calendar/templates/verdilak/header.inc.php b/calendar/templates/verdilak/header.inc.php
index 6f8b08a7ec..2d3c548d6b 100755
--- a/calendar/templates/verdilak/header.inc.php
+++ b/calendar/templates/verdilak/header.inc.php
@@ -146,9 +146,9 @@
 	{
 		$hidden_vars .= '    <input type="hidden" name="date" value="'.$HTTP_GET_VARS['date'].'">'."\n";
 	}
-	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->so->month.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->so->day.'">'."\n";
-	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->so->year.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n";
 	if(isset($this->bo->filter) && $this->bo->filter)
 	{
 		$hidden_vars .= '    <input type="hidden" name="filter" value="'.$this->bo->filter.'">'."\n";