Index: trunk/bp-friends.php
===================================================================
--- trunk/bp-friends.php	(revision 3628)
+++ trunk/bp-friends.php	(working copy)
@@ -107,10 +107,15 @@
 }
 
 function friends_screen_notification_settings() {
-	global $bp; 
-	
+	global $bp;
+	$send_requests = get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true );
+	if( !$send_requests )
+		$send_requests = 'yes';
+	$accept_requests = get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true );
+	if( !$accept_requests )
+		$accept_requests = 'yes';
 	?>
-	
+
 	<table class="notification-settings zebra" id="friends-notification-settings">
 		<thead>
 			<tr>
@@ -125,14 +130,14 @@
 			<tr id="friends-notification-settings-request">
 				<td></td>
 				<td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php checked( $send_requests, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php checked( $send_requests, 'no', true ); ?>/></td>
 			</tr>
 			<tr id="friends-notification-settings-accepted">
 				<td></td>
 				<td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php checked( $accept_requests, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php checked( $accept_requests, 'no', true ); ?>/></td>
 			</tr>
 
 			<?php do_action( 'friends_screen_notification_settings' ); ?>
Index: trunk/bp-activity.php
===================================================================
--- trunk/bp-activity.php	(revision 3628)
+++ trunk/bp-activity.php	(working copy)
@@ -202,10 +202,15 @@
 add_action( 'wp', 'bp_activity_screen_single_activity_permalink', 3 );
 
 function bp_activity_screen_notification_settings() {
-	global $bp; 
-	
+	global $bp;
+	$mention = get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true );
+	if( !$mention )
+		$mention = 'yes';
+	$reply = get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true );
+	if( !$reply )
+		$reply = 'yes';
 	?>
-	
+
 	<table class="notification-settings zebra" id="activity-notification-settings">
 		<thead>
 			<tr>
@@ -220,14 +225,14 @@
 			<tr id="activity-notification-settings-mentions">
 				<td></td>
 				<td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php checked( $mention, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php checked( $mention, 'no', true ); ?>/></td>
 			</tr>
 			<tr id="activity-notification-settings-replies">
 				<td></td>
 				<td><?php _e( "A member replies to an update or comment you've posted", 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php checked( $reply, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php checked( $reply, 'no', true ); ?>/></td>
 			</tr>
 
 			<?php do_action( 'bp_activity_screen_notification_settings' ) ?>
Index: trunk/bp-messages.php
===================================================================
--- trunk/bp-messages.php	(revision 3628)
+++ trunk/bp-messages.php	(working copy)
@@ -167,10 +167,15 @@
 }
 
 function messages_screen_notification_settings() {
-	global $bp; 
-	
+	global $bp;
+	$new_messages = get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true );
+	if( !$new_messages )
+		$new_messages = 'yes';
+	$new_notices = get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true );
+	if( !$new_notices )
+		$new_notices = 'yes';
 	?>
-	
+
 	<table class="notification-settings zebra" id="messages-notification-settings">
 		<thead>
 			<tr>
@@ -185,14 +190,14 @@
 			<tr id="messages-notification-settings-new-message">
 				<td></td>
 				<td><?php _e( 'A member sends you a new message', 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php checked( $new_messages, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php checked( $new_messages, 'no', true ); ?>/></td>
 			</tr>
 			<tr id="messages-notification-settings-new-site-notice">
 				<td></td>
 				<td><?php _e( 'A new site notice is posted', 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php checked( $new_notices, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php checked( $new_notices, 'no', true ); ?>/></td>
 			</tr>
 
 			<?php do_action( 'messages_screen_notification_settings' ) ?>
Index: trunk/bp-groups.php
===================================================================
--- trunk/bp-groups.php	(revision 3628)
+++ trunk/bp-groups.php	(working copy)
@@ -947,10 +947,21 @@
 add_action( 'wp', 'groups_screen_group_admin_delete_group', 4 );
 
 function groups_screen_notification_settings() {
-	global $bp; 
-	
+	global $bp;
+	$group_invite = get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true );
+	if( !$group_invite )
+		$group_invite = 'yes';
+	$group_update = get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true );
+	if( !$group_update )
+		$group_update = 'yes';
+	$group_promo = get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true );
+	if( !$group_promo )
+		$group_promo = 'yes';
+	$group_request = get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true );
+	if( !$group_request )
+		$group_request = 'yes';
 	?>
-	
+
 	<table class="notification-settings zebra" id="groups-notification-settings">
 		<thead>
 			<tr>
@@ -965,26 +976,26 @@
 			<tr id="groups-notification-settings-invitation">
 				<td></td>
 				<td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php checked( $group_invite, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php checked( $group_invite, 'no', true ); ?>/></td>
 			</tr>
 			<tr id="groups-notification-settings-info-updated">
 				<td></td>
 				<td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php checked( $group_update, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php checked( $group_update, 'no', true ); ?>/></td>
 			</tr>
 			<tr id="groups-notification-settings-promoted">
 				<td></td>
 				<td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php checked( $group_promo, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php checked( $group_promo, 'no', true ); ?>/></td>
 			</tr>
 			<tr id="groups-notification-settings-request">
 				<td></td>
 				<td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
-				<td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
-				<td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
+				<td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php checked( $group_request, 'yes', true ); ?>/></td>
+				<td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php checked( $group_request, 'no', true ); ?>/></td>
 			</tr>
 
 			<?php do_action( 'groups_screen_notification_settings' ); ?>