diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php
index 8c55c64f4..83ec36506 100644
--- a/upload/includes/ucp/usercp_viewprofile.php
+++ b/upload/includes/ucp/usercp_viewprofile.php
@@ -94,7 +94,7 @@ $template->assign_vars(array(
 	'PAGE_TITLE' 	=> sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']),
 	'USERNAME' 		=> $profiledata['username'],
 	'PROFILE_USER_ID' => $profiledata['user_id'],
-	'USER_REGDATE' 	=> bb_date($profiledata['user_regdate']),
+	'USER_REGDATE' 	=> bb_date($profiledata['user_regdate'], 'Y-m-d H:i'),
 	'POSTER_RANK' 	=> $poster_rank,
 	'RANK_IMAGE' 	=> $rank_image,
 	'RANK_SELECT' 	=> $rank_select,
@@ -103,8 +103,8 @@ $template->assign_vars(array(
 	'EMAIL' 	=> $email,
 	'WWW' 		=> $profiledata['user_website'],
 	'ICQ' 		=> $profiledata['user_icq'],
-	'LAST_VISIT_TIME' => ($profiledata['user_lastvisit']) ? bb_date($profiledata['user_lastvisit']) : $lang['NEVER'],
-	'LAST_ACTIVITY_TIME' => ($profiledata['user_session_time']) ? bb_date($profiledata['user_session_time']) : $lang['NEVER'],
+	'LAST_VISIT_TIME' => ($profiledata['user_lastvisit']) ? (bf($profiledata['user_opt'], 'user_opt', 'allow_viewonline') && !IS_ADMIN) ? '---' : bb_date($profiledata['user_lastvisit'], 'Y-m-d H:i') : $lang['NEVER'],
+	'LAST_ACTIVITY_TIME' => ($profiledata['user_session_time']) ? (bf($profiledata['user_opt'], 'user_opt', 'allow_viewonline') && !IS_ADMIN) ? '---' : bb_date($profiledata['user_session_time'], 'Y-m-d H:i') : $lang['NEVER'],
 	'LOCATION' => ($profiledata['user_from']) ? $profiledata['user_from'] : '',
 
 	'USER_ACTIVE' 	=> $profiledata['user_active'],