diff --git a/admin/index.php b/admin/index.php
index d2acb043..43cc23aa 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -226,8 +226,8 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
 					$template->assign_block_vars('reg_user_row', array(
 						'ROW_CLASS'  => $row_class,
 						'USER'       => profile_url($onlinerow_reg[$i]),
-						'STARTED'    => bb_date($onlinerow_reg[$i]['session_start'], 'H:i', false),
-						'LASTUPDATE' => bb_date($onlinerow_reg[$i]['user_session_time'], 'H:i', false),
+						'STARTED'    => bb_date($onlinerow_reg[$i]['session_start'], $bb_cfg['last_activity_date_format'], false),
+						'LASTUPDATE' => bb_date($onlinerow_reg[$i]['user_session_time'], $bb_cfg['last_activity_date_format'], false),
 						'IP_ADDRESS' => $reg_ip,
 						'U_WHOIS_IP' => $bb_cfg['whois_info'] . $reg_ip,
 					));
diff --git a/library/ajax/edit_user_profile.php b/library/ajax/edit_user_profile.php
index 22c89b0e..a1ec9807 100644
--- a/library/ajax/edit_user_profile.php
+++ b/library/ajax/edit_user_profile.php
@@ -116,7 +116,7 @@ switch ($field)
 		{
 			$this->ajax_die($lang['INVALID_DATE'] . $this->request['value']);
 		}
-		$this->response['new_value'] = bb_date($value, 'Y-m-d H:i', false);
+		$this->response['new_value'] = bb_date($value, (($field == 'user_regdate') ? $bb_cfg['reg_date_format'] : $bb_cfg['last_visit_date_format']), false);
 		break;
 
 	case 'u_up_total':
@@ -170,4 +170,4 @@ DB()->query("UPDATE $table SET $field = $value_sql WHERE user_id = $user_id LIMI
 
 cache_rm_user_sessions ($user_id);
 
-$this->response['edit_id'] = $this->request['edit_id'];
\ No newline at end of file
+$this->response['edit_id'] = $this->request['edit_id'];
diff --git a/library/config.php b/library/config.php
index 02e197a0..375ce93e 100644
--- a/library/config.php
+++ b/library/config.php
@@ -383,6 +383,7 @@ $bb_cfg['date_format']              = 'Y-m-d'; // общий формат дат
 $bb_cfg['current_time_date_format'] = 'd-M H:i'; // формат блока "текущее время" на сайте
 $bb_cfg['reg_date_format']          = 'Y-m-d H:i'; // формат даты регистрации пользователя
 $bb_cfg['last_visit_date_format']   = 'Y-m-d H:i'; // формат даты последнего визита на сайте
+$bb_cfg['last_activity_date_format'] = 'Y-m-d H:i'; // формат даты последней активности на сайте
 $bb_cfg['last_post_date_format']    = 'd-M-y H:i'; // формат даты последнего поста (на странице просмотра форума и на главной)
 
 // Subforums
diff --git a/library/includes/ucp/viewprofile.php b/library/includes/ucp/viewprofile.php
index c41aa5f2..80f80e7c 100644
--- a/library/includes/ucp/viewprofile.php
+++ b/library/includes/ucp/viewprofile.php
@@ -97,7 +97,7 @@ $template->assign_vars(array(
 	'WWW'                  => $profiledata['user_website'],
 	'ICQ'                  => $profiledata['user_icq'],
 	'LAST_VISIT_TIME'      => ($profiledata['user_lastvisit']) ? (!$profile_user_id && bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? $lang['HIDDEN_USER'] : bb_date($profiledata['user_lastvisit'], $bb_cfg['last_visit_date_format'], false) : $lang['NEVER'],
-	'LAST_ACTIVITY_TIME'   => ($profiledata['user_session_time']) ? (!$profile_user_id && bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? $lang['HIDDEN_USER'] : bb_date($profiledata['user_session_time'], 'Y-m-d H:i', false) : $lang['NEVER'],
+	'LAST_ACTIVITY_TIME'   => ($profiledata['user_session_time']) ? (!$profile_user_id && bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? $lang['HIDDEN_USER'] : bb_date($profiledata['user_session_time'], $bb_cfg['last_activity_date_format'], false) : $lang['NEVER'],
 
 	'USER_ACTIVE'          => $profiledata['user_active'],
 	'LOCATION'             => $profiledata['user_from'],
diff --git a/styles/templates/admin/index.tpl b/styles/templates/admin/index.tpl
index 9d96209c..3968f6f5 100644
--- a/styles/templates/admin/index.tpl
+++ b/styles/templates/admin/index.tpl
@@ -204,7 +204,7 @@ ajax.callback.manage_admin = function(data) {
 	<!-- BEGIN reg_user_row -->
 	<tr class="{reg_user_row.ROW_CLASS}">
 		<td class="bold" nowrap="nowrap">{reg_user_row.USER}</td>
-		<td align="center" nowrap="nowrap">{reg_user_row.STARTED}-{reg_user_row.LASTUPDATE}</td>
+		<td align="center" nowrap="nowrap"><b>{L_LOGIN}:</b> {reg_user_row.STARTED} | <b>{L_LAST_UPDATED}:</b> {reg_user_row.LASTUPDATE}</td>
 		<td class="tCenter"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_blank">{reg_user_row.IP_ADDRESS}</a></td>
 	</tr>
 	<!-- END reg_user_row -->