Index: openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	20 Jan 2002 19:19:36 -0000	1.16
+++ openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	11 Feb 2002 02:39:49 -0000	1.17
@@ -138,16 +138,21 @@
 	set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
 	
 	# Get the package_id by callback
-	set package_id [dotlrn_community::get_package_id $community_id]
+	set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]]
 
 	# Remove the portal element
 	faq_portlet::remove_self_from_page $portal_id $package_id
 
 	# Buh Bye.
 	faq_portlet::make_self_unavailable $portal_id
+        
+        # Remove from main workspace
+        set workspace_portal_id [dotlrn::get_workspace_portal_id $user_id]
 
-	# remove user permissions to see faqs
-	# nothing to do here
+        # Remove the portlet
+        if {![empty_string_p $workspace_portal_id]} {
+            faq_portlet::remove_self_from_page $workspace_portal_id $package_id
+        }
     }
 	
 }