--- a/branches/2.5.4/cgi-bin/yabb2/Sources/System.pm
+++ b/branches/2.5.4/cgi-bin/yabb2/Sources/System.pm
@@ -14,7 +14,7 @@
 use CGI::Carp qw(fatalsToBrowser);
 our $VERSION = '2.5.4';
 
-$systempmver = 'YaBB 2.5.4 $Revision: 1061 $';
+$systempmver = 'YaBB 2.5.4 $Revision: 1069 $';
 
 sub BoardTotals {
     my ( $job, @updateboards ) = @_;
@@ -334,13 +334,12 @@
 
     # using sequential tag writing as hashes do not sort the way we like them to
     my @tags =
-      qw(realname password position addgroups email hidemail regdate regtime regreason location bday hideage disableage gender disablegender userpic usertext signature template language stealth webtitle weburl icq aim yim skype myspace facebook twitter youtube msn gtalk timeselect timeformat timeoffset dsttimeoffset dynamic_clock postcount lastonline lastpost lastim im_ignorelist im_popup im_imspop pmviewMess notify_me board_notifications thread_notifications favorites buddylist cathide pageindex reversetopic postlayout sesquest sesanswer session lastips onlinealert offlinestatus awaysubj awayreply awayreplysent spamcount spamtime hide_avatars hide_user_text hide_attach_img hide_signat hide_smilies_row numberformat);
+      qw(realname password position addgroups email hidemail regdate regtime regreason location bday hideage disableage gender disablegender userpic usertext signature template language stealth webtitle weburl icq aim yim skype myspace facebook twitter youtube msn gtalk timeselect timeformat timeoffset dsttimeoffset dynamic_clock postcount lastonline lastpost lastim im_ignorelist im_popup im_imspop pmviewMess notify_me board_notifications thread_notifications favorites buddylist cathide pageindex reversetopic postlayout sesquest sesanswer session lastips onlinealert offlinestatus awaysubj awayreply awayreplysent spamcount spamtime hide_avatars hide_user_text hide_attach_img hide_signat hide_smilies_row numberformat collapsebdrules return_to);
+
     if ($extendedprofiles) {
         require Sources::ExtendedProfiles;
         push @tags, ext_get_fields_array();
     }
-    push @tags, 'collapsebdrules';
-
     fopen( UPDATEUSER, ">$memberdir/$user.$userext", 1 )
       || fatal_error( 'cannot_open', "$memberdir/$user.$userext", 1 );
     print {UPDATEUSER} "### User variables for ID: $user ###\n\n"