Index: openacs-4/packages/contacts/lib/contact-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/lib/contact-master.adp	28 Jun 2005 04:02:56 -0000	1.4
+++ openacs-4/packages/contacts/lib/contact-master.adp	2 Apr 2006 22:10:28 -0000	1.5
@@ -22,8 +22,8 @@
 <else>
   <master src="@contact_master_template@">
   <property name="party_id">@party_id@</property>
+  <if @title@ not nil><property name="title">@title;noquote@</property></if>
+  <if @context@ not nil><property name="context">@context;noquote@</property></if>
 </else>
 
 <slave>
-
-
Index: openacs-4/packages/contacts/lib/contact-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/contacts/lib/contact-master.tcl	4 Mar 2006 22:58:41 -0000	1.16
+++ openacs-4/packages/contacts/lib/contact-master.tcl	2 Apr 2006 22:10:28 -0000	1.17
@@ -2,10 +2,10 @@
 #    @creation-date 2005-05-09
 #    @cvs-id $Id$
 
-
 set contact_master_template [parameter::get_from_package_key -package_key "contacts" -parameter "ContactMaster" -default "/packages/contacts/lib/contact-master"]
 if { $contact_master_template != "/packages/contacts/lib/contact-master" } {
     ad_return_template
+    return
 }
 
 # Set up links in the navbar that the user has access to
Index: openacs-4/packages/contacts/www/contact-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-add.tcl,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/contacts/www/contact-add.tcl	27 Feb 2006 03:46:17 -0000	1.44
+++ openacs-4/packages/contacts/www/contact-add.tcl	2 Apr 2006 22:10:29 -0000	1.45
@@ -311,6 +311,7 @@
 	    }
 	    
 	    callback contact::${object_type}_new_rel -object_id_two $object_id_two -rel_type $rel_type -party_id $party_id
+	    contact::flush -party_id $object_id_two
 	}
 
 	# Add the user to the
Index: openacs-4/packages/contacts/www/relationship-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-add.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/contacts/www/relationship-add.tcl	15 Feb 2006 10:06:36 -0000	1.8
+++ openacs-4/packages/contacts/www/relationship-add.tcl	2 Apr 2006 22:10:29 -0000	1.9
@@ -46,13 +46,19 @@
     set contact_type_one "person"
     util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $party_id *"
     util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $party_id"
+} else {
+    contact::flush -party_id $party_id
 }
+
 set contact_type_two [contact::type -party_id $party_two]
 if { $contact_type_two == "user" } {
     set contact_type_two "person"
     util_memoize_flush_regexp "::contact::employee::get_not_cached -employee_id $party_two *"
     util_memoize_flush_regexp "::contact::employee_not_cached -employee_id $party_two"
+} else {
+    contact::flush -party_id $party_two
 }
+
 set secondary_role_pretty [lang::util::localize [db_string get_secondary_role_pretty {}]]
 if { ![exists_and_not_null rel_type] } {
     set options_list [db_list_of_lists get_rel_types {}]