Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r9973 -r9976
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 9973)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 9976)
@@ -156,4 +156,10 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseColumnFreezer', '0', 'In-Portal', 'in-portal:configure_general');
 
 INSERT INTO ConfigurationAdmin VALUES ('TrimRequiredFields', 'la_Text_Website', 'la_config_TrimRequiredFields', 'checkbox', '', '', 10.23, 0, 0);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'TrimRequiredFields', '0', 'In-Portal', 'in-portal:configure_general');
\ No newline at end of file
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'TrimRequiredFields', '0', 'In-Portal', 'in-portal:configure_general');
+
+INSERT INTO ConfigurationAdmin VALUES ('MenuFrameWidth', 'la_title_General', 'la_prompt_MenuFrameWidth', 'text', NULL, NULL, '11', '0', '0');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MenuFrameWidth', 200, 'Proj-Base', 'in-portal:configure_general');
+
+INSERT INTO ConfigurationAdmin VALUES ('DefaultSettingsUserId', 'la_title_General', 'la_prompt_DefaultUserId', 'text', NULL, NULL, '12', '0', '0');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'DefaultSettingsUserId', -1, 'Proj-Base', 'in-portal:configure_general');
\ No newline at end of file
Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r9839 -r9976
--- branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 9839)
+++ branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 9976)
@@ -697,7 +697,7 @@
 				$view_name = $this->Application->RecallVar($event->getPrefixSpecial().'_current_view');
 
 				$storage_prefix = $event->getEventParam('same_special') ? $event->Prefix : $event->getPrefixSpecial();
-				$per_page = $this->Application->RecallPersistentVar($storage_prefix.'_PerPage.'.$view_name);
+				$per_page = $this->Application->RecallPersistentVar($storage_prefix.'_PerPage.'.$view_name, '_USE_DEFAULT_USER_DATA_');
 
 				if (!$per_page) {
 					// per-page is stored to current session
Index: branches/RC/core/admin_templates/js/toolbar.js
===================================================================
diff -u -N -r8929 -r9976
--- branches/RC/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 8929)
+++ branches/RC/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 9976)
@@ -63,7 +63,7 @@
 ToolBarButton.prototype.GetHTML = function() {
 	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
 	var o = '<div class="toolbar-button" id="'+this.GetToolID('div')+'" '+add_style+'>'
-	o += '<img id="' + this.GetToolID() + '" width="'+this.ToolBar.IconSize.w+'" height="'+this.ToolBar.IconSize.h+'" src="' + this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif" title="' + this.Alt + '">';
+	o += '<img id="' + this.GetToolID() + '" width="'+this.ToolBar.IconSize.w+'" height="'+this.ToolBar.IconSize.h+'" src="' + this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif" title="' + this.Alt + '&nbsp;">';
 	if (this.ToolBar.UseLabels) o += '<br/>'+this.Label;
 	o += '</div>'
 	return o;
Index: branches/RC/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -N -r9639 -r9976
--- branches/RC/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 9639)
+++ branches/RC/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 9976)
@@ -31,7 +31,14 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
+				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_ResetSettings" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_ResetSettings" escape="1"/>',
+						function() {
+							set_hidden_field('remove_specials[u.admins]', 1);
+							submit_event('u.admins', 'OnMassResetSettings');
+						} ) );
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+				
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r9841 -r9976
--- branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 9841)
+++ branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 9976)
@@ -27,6 +27,7 @@
 				'OnRecommend'				=>	Array('self' => true),
 
 				'OnItemBuild'				=>	Array('self' => true),
+				'OnMassResetSettings'	=> Array('self' => 'edit'),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
Index: branches/RC/core/install/upgrades.php
===================================================================
diff -u -N -r9363 -r9976
--- branches/RC/core/install/upgrades.php	(.../upgrades.php)	(revision 9363)
+++ branches/RC/core/install/upgrades.php	(.../upgrades.php)	(revision 9976)
@@ -158,34 +158,13 @@
 		}
 
 		/**
-		 * Makes admin primary language same as front-end
+		 * Makes admin primary language same as front-end - not needed, done in SQL
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
 		function Upgrade_4_2_1($mode)
 		{
-			if ($mode == 'after') {
-				$id_field = $this->Application->getUnitOption('lang', 'IDField');
-				$table_name = $this->Application->getUnitOption('lang', 'TableName');
-
-				$sql = 'SELECT '.$id_field.'
-						FROM '.$table_name.'
-						WHERE PrimaryLang = 1 AND Enabled = 1';
-				$language_id = $this->Conn->GetOne($sql);
-
-				if ($language_id) {
-					// reset admin language
-					$sql = 'UPDATE '.$table_name.'
-							SET AdminInterfaceLang = 0';
-					$this->Conn->Query($sql);
-
-					// set admin language to front-end
-					$sql = 'UPDATE '.$table_name.'
-							SET AdminInterfaceLang = 1
-							WHERE '.$id_field.' = '.$language_id;
-					$this->Conn->Query($sql);
-				}
-			}
+			
 		}
 
 	}