diff --git a/calendar/inc/hook_preferences.inc.php b/calendar/inc/hook_preferences.inc.php
index a2623cc65c..e7438f0041 100644
--- a/calendar/inc/hook_preferences.inc.php
+++ b/calendar/inc/hook_preferences.inc.php
@@ -39,7 +39,7 @@
 //	echo '<a href="' . $phpgw->link('/calendar/categories.php') . '">'
 //		. lang('Edit Categories') . '</a><br>';
 
-	echo '<a href="' . $phpgw->link('/calendar/acl_preferences.php') . '">'
+	echo '<a href="' . $phpgw->link('/preferences/acl_preferences.php','acl_app=calendar') . '">'
 		. lang('Grant Calendar Access') . '</a>';
 
 	section_end(); 
diff --git a/calendar/templates/default/preference_acl_row.tpl b/calendar/templates/default/preference_acl_row.tpl
index 9c194b41ef..01b22d84b5 100755
--- a/calendar/templates/default/preference_acl_row.tpl
+++ b/calendar/templates/default/preference_acl_row.tpl
@@ -5,4 +5,5 @@
     <td align="center"><input type="checkbox" name="{add}" value="Y"{add_selected}></td>
     <td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
     <td align="center"><input type="checkbox" name="{delete}" value="Y"{delete_selected}></td>
+    <td align="center"><input type="checkbox" name="{private}" value="Y"{private_selected}></td>
    </tr>
diff --git a/calendar/templates/default/preference_acl_row_private.tpl b/calendar/templates/default/preference_acl_row_private.tpl
deleted file mode 100755
index 01b22d84b5..0000000000
--- a/calendar/templates/default/preference_acl_row_private.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- $Id$ -->
-   <tr bgcolor="{row_color}">
-    <td>{user}</td>
-    <td align="center"><input type="checkbox" name="{read}" value="Y"{read_selected}></td>
-    <td align="center"><input type="checkbox" name="{add}" value="Y"{add_selected}></td>
-    <td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
-    <td align="center"><input type="checkbox" name="{delete}" value="Y"{delete_selected}></td>
-    <td align="center"><input type="checkbox" name="{private}" value="Y"{private_selected}></td>
-   </tr>
diff --git a/calendar/templates/default/preference_colspan_private.tpl b/calendar/templates/default/preference_colspan_private.tpl
deleted file mode 100755
index 6360c88b20..0000000000
--- a/calendar/templates/default/preference_colspan_private.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-  <tr bgcolor="{bg_color}">
-    <td>{string}</td>
-    <td align="center">{read_lang}</td>
-    <td align="center">{add_lang}</td>
-    <td align="center">{edit_lang}</td>
-    <td align="center">{delete_lang}</td>
-    <td align="center">{private_lang}</td>
-  </tr>
diff --git a/calendar/templates/idsociety/preference_acl_row_private.tpl b/calendar/templates/idsociety/preference_acl_row_private.tpl
deleted file mode 100755
index 01b22d84b5..0000000000
--- a/calendar/templates/idsociety/preference_acl_row_private.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- $Id$ -->
-   <tr bgcolor="{row_color}">
-    <td>{user}</td>
-    <td align="center"><input type="checkbox" name="{read}" value="Y"{read_selected}></td>
-    <td align="center"><input type="checkbox" name="{add}" value="Y"{add_selected}></td>
-    <td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
-    <td align="center"><input type="checkbox" name="{delete}" value="Y"{delete_selected}></td>
-    <td align="center"><input type="checkbox" name="{private}" value="Y"{private_selected}></td>
-   </tr>
diff --git a/calendar/templates/idsociety/preference_colspan_private.tpl b/calendar/templates/idsociety/preference_colspan_private.tpl
deleted file mode 100755
index 6360c88b20..0000000000
--- a/calendar/templates/idsociety/preference_colspan_private.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-  <tr bgcolor="{bg_color}">
-    <td>{string}</td>
-    <td align="center">{read_lang}</td>
-    <td align="center">{add_lang}</td>
-    <td align="center">{edit_lang}</td>
-    <td align="center">{delete_lang}</td>
-    <td align="center">{private_lang}</td>
-  </tr>
diff --git a/calendar/templates/verdilak/preference_acl_row.tpl b/calendar/templates/verdilak/preference_acl_row.tpl
index 9c194b41ef..01b22d84b5 100755
--- a/calendar/templates/verdilak/preference_acl_row.tpl
+++ b/calendar/templates/verdilak/preference_acl_row.tpl
@@ -5,4 +5,5 @@
     <td align="center"><input type="checkbox" name="{add}" value="Y"{add_selected}></td>
     <td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
     <td align="center"><input type="checkbox" name="{delete}" value="Y"{delete_selected}></td>
+    <td align="center"><input type="checkbox" name="{private}" value="Y"{private_selected}></td>
    </tr>
diff --git a/calendar/templates/verdilak/preference_acl_row_private.tpl b/calendar/templates/verdilak/preference_acl_row_private.tpl
deleted file mode 100755
index 01b22d84b5..0000000000
--- a/calendar/templates/verdilak/preference_acl_row_private.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- $Id$ -->
-   <tr bgcolor="{row_color}">
-    <td>{user}</td>
-    <td align="center"><input type="checkbox" name="{read}" value="Y"{read_selected}></td>
-    <td align="center"><input type="checkbox" name="{add}" value="Y"{add_selected}></td>
-    <td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
-    <td align="center"><input type="checkbox" name="{delete}" value="Y"{delete_selected}></td>
-    <td align="center"><input type="checkbox" name="{private}" value="Y"{private_selected}></td>
-   </tr>
diff --git a/calendar/templates/verdilak/preference_colspan.tpl b/calendar/templates/verdilak/preference_colspan.tpl
index edc175ca04..6360c88b20 100755
--- a/calendar/templates/verdilak/preference_colspan.tpl
+++ b/calendar/templates/verdilak/preference_colspan.tpl
@@ -4,4 +4,5 @@
     <td align="center">{add_lang}</td>
     <td align="center">{edit_lang}</td>
     <td align="center">{delete_lang}</td>
+    <td align="center">{private_lang}</td>
   </tr>
diff --git a/calendar/templates/verdilak/preference_colspan_private.tpl b/calendar/templates/verdilak/preference_colspan_private.tpl
deleted file mode 100755
index 6360c88b20..0000000000
--- a/calendar/templates/verdilak/preference_colspan_private.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-  <tr bgcolor="{bg_color}">
-    <td>{string}</td>
-    <td align="center">{read_lang}</td>
-    <td align="center">{add_lang}</td>
-    <td align="center">{edit_lang}</td>
-    <td align="center">{delete_lang}</td>
-    <td align="center">{private_lang}</td>
-  </tr>