Index: user-tool-prefs/tool/src/bundle/user-tool-prefs.properties
===================================================================
--- user-tool-prefs/tool/src/bundle/user-tool-prefs.properties	(revision 127276)
+++ user-tool-prefs/tool/src/bundle/user-tool-prefs.properties	(working copy)
@@ -82,12 +82,14 @@
 locale_msg=Please select your language (and country) preference. Your current language preference is:
 
 privacy_title=Privacy Status
-
+privacy_default=Default Status
+privacy_item_visible=Make me visible when I am added to sites by default
+privacy_item_hidden=Hide me when I am added to sites by default
 privacy_stmt1=You may alter your settings to keep yourself and your personal information hidden from others in this site. Your status in this site is currently set to "
-
+privacy_specific_site=Set status for a specific site
 privacy_stmt_show=." Others can see your name in the roster and can contact you through the site.
 privacy_stmt_hide=." Others cannot see your name in the roster and cannot contact you through the site.
-
+privacy_all_sites=Change your status in all your sites
 privacy_change_directions=If you would like to change your status, check the box next to
 privacy_change_directions2=and then click the Update button below.
 
Index: user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/PrivacyBean.java
===================================================================
--- user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/PrivacyBean.java	(revision 127276)
+++ user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/PrivacyBean.java	(working copy)
@@ -59,6 +59,7 @@
 	private String checkboxText;
 	private boolean changeStatus;
 	private String privacyStatus;
+	private String defaultPrivacyStatus;
 	private Boolean displayPopup;	
 	private String selectedSite;
 	private boolean siteSelected = false;
@@ -275,20 +276,22 @@
 	 * Determines if ready to change status and calls method to do so
 	 */
 	public String processUpdate() {
-		if (isMyWorkspace() && ! siteSelected) {
-			noSiteProcessErr = true;
-			//setUpdateMessage(true);
-			return "main";
-		}
+//		if (isMyWorkspace() && ! siteSelected) {
+//			noSiteProcessErr = true;
+//			//setUpdateMessage(true);
+//			return "main";
+//		}
 		
+		if (isMyWorkspace() && siteSelected) {
 		if (!privacyStatus.equals("")){
 			processChoice(isMyWorkspace() ? curSite : getContextId(), privacyStatus.equals(HIDDEN) ? false : true);
-            setUpdateMessage(true);
 		}
 		displayPopup = false;
+		}
+		
+		privacyManager.setDefaultPrivacyState(getUserId(), defaultPrivacyStatus);
+		setUpdateMessage(true);
 
-
-
 		/**
 		// if user checked the checkbox
 		if (changeStatus) {
@@ -421,4 +424,16 @@
     public void setUpdateMessage(boolean updateMessage) {
         this.updateMessage = updateMessage;
     }
+
+	public String getDefaultPrivacyStatus() {
+		if (defaultPrivacyStatus == null) {
+			defaultPrivacyStatus = privacyManager.getDefaultPrivacyState(getUserId());
+		}
+		
+		return defaultPrivacyStatus;
+	}
+
+	public void setDefaultPrivacyStatus(String defaultPrivacyStatus) {
+		this.defaultPrivacyStatus = defaultPrivacyStatus;
+	}
 }
Index: user-tool-prefs/tool/src/webapp/prefs/privacy.jsp
===================================================================
--- user-tool-prefs/tool/src/webapp/prefs/privacy.jsp	(revision 127276)
+++ user-tool-prefs/tool/src/webapp/prefs/privacy.jsp	(working copy)
@@ -6,7 +6,9 @@
 <% response.setContentType("text/html; charset=UTF-8"); %>
 
 <f:view> 
-  <sakai:view> 
+	<sakai:view_container title="#{msgs.privacy_title}">
+    <sakai:stylesheet path="/css/prefs.css"/>
+	<sakai:view_content>
     <h:form>
       <!--SAK-18566 -->
      <script type="text/javascript" language="JavaScript" src="/library/js/jquery.js"></script>
@@ -64,14 +66,26 @@
 		 </h:panelGroup>
 	   </h3>
 
-        <f:verbatim></h3></div><br /></f:verbatim>
-	  
+		<f:verbatim></h3></div></f:verbatim>
 	 	<%--  Message if Show All or Hide All has been clicked --%>
 	 	<f:verbatim><div></f:verbatim>
 	 	<h:outputText value="#{privacyBean.changeAllMsg}" styleClass="success" rendered="#{privacyBean.allChanged}" />
-	 	<f:verbatim></div><br /></f:verbatim>
+		<f:verbatim></div></f:verbatim>
 			  
+	<f:verbatim><br /><h4></f:verbatim>
+	<h:outputText value="#{msgs.privacy_default}" />
+	<f:verbatim></h4><br /></f:verbatim>
+	<h:selectOneRadio value="#{privacyBean.defaultPrivacyStatus}" layout="pageDirection">
+		<f:selectItem itemLabel="#{msgs.privacy_item_visible}" itemValue="#{privacyBean.visibleValue}" />
+		<f:selectItem itemLabel="#{msgs.privacy_item_hidden}" itemValue="#{privacyBean.hiddenValue}" />
+	</h:selectOneRadio>
+	<f:verbatim><br /></f:verbatim>
+
         <h:outputText value="#{msgs.privacy_no_choices}" rendered="#{privacyBean.sitesEmpty}" />
+        <f:verbatim><h4></f:verbatim>
+		<h:outputText value="#{msgs.privacy_specific_site}" />
+		<f:verbatim></h4></f:verbatim>
+		<f:verbatim><br /></f:verbatim>
 	 	<h:outputText value="#{msgs.privacy_choose}" rendered="#{not privacyBean.sitesEmpty}" />
 
    		<h:selectOneMenu value="#{privacyBean.selectedSite}" immediate="true" onchange="this.form.submit( );"
@@ -142,11 +156,15 @@
 	  	value="<script type=\"text/javascript\">parent.privacy_show_popup();</script>" />
 
   	</h:panelGroup>
-         
    		<h:panelGroup rendered="#{privacyBean.myWorkspace && not privacyBean.sitesEmpty}" >
  	  	  <sakai:button_bar>
         	<sakai:button_bar_item action="#{privacyBean.processUpdate}" value="#{msgs.privacy_update}"
                 accesskey="u" title="#{msgs.privacy_update_title}" styleClass="active" />
+	  	  </sakai:button_bar>
+	  	  <f:verbatim><h4></f:verbatim>
+		  <h:outputText value="#{msgs.privacy_all_sites}" />
+		  <f:verbatim></h4></f:verbatim>
+		<sakai:button_bar>
    			<sakai:button_bar_item action="#{privacyBean.processShowAll}" value="#{msgs.privacy_show_all}"
    				accesskey="s" title="#{msgs.privacy_show_title}" styleClass="active" />
    			<sakai:button_bar_item action="#{privacyBean.processHideAll}" value="#{msgs.privacy_hide_all}"
@@ -155,7 +173,8 @@
 	   	</h:panelGroup>
 
     </h:form>
-  </sakai:view>
+    </sakai:view_content>
+    </sakai:view_container>
 </f:view>  
 
 <%