diff --git a/group.php b/group.php
index 38778d45..a4f417bd 100644
--- a/group.php
+++ b/group.php
@@ -16,7 +16,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
 {
 	global $lang, $images, $bb_cfg;
 
-	$from      = (!empty($row['user_from'])) ? $row['user_from'] : '';
+	$from      = (!empty($row['user_from'])) ? $row['user_from'] : $lang['NOSELECT'];
 	$joined    = bb_date($row['user_regdate']);
 	$user_time = (!empty($row['user_time'])) ? bb_date($row['user_time']) : $lang['NONE'];
 	$posts     = ($row['user_posts']) ? $row['user_posts'] : 0;
@@ -28,13 +28,13 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
 		$email_uri = ($bb_cfg['board_email_form']) ? ("profile.php?mode=email&". POST_USERS_URL ."=".$row['user_id']) : 'mailto:'. $row['user_email'];
 		$email = '<a class="editable" href="'. $email_uri .'">'. $row['user_email'] .'</a>';
 	}
-	else $email = '';
+	else $email = $lang['NOSELECT'];
 
 	if ($row['user_website'])
 	{
 		$www = ($bb_cfg['text_buttons']) ? '<a class="txtb" href="'. $row['user_website'] .'"  target="_userwww">'. $lang['VISIT_WEBSITE_TXTB'] .'</a>' : '<a class="txtb" href="'. $row['user_website'] .'" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['VISIT_WEBSITE'] . '" title="' . $lang['VISIT_WEBSITE'] . '" border="0" /></a>';
 	}
-	else $www = '';
+	else $www = $lang['NOSELECT'];
 
 	return;
 }
diff --git a/memberlist.php b/memberlist.php
index 7a55374d..ca3296ae 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -178,7 +178,7 @@ if ($result = DB()->fetch_rowset($sql))
 		}
 		else
 		{
-			$email = '';
+			$email = $lang['NOSELECT'];
 		}
 
 		if ($row['user_website'])
@@ -187,9 +187,14 @@ if ($result = DB()->fetch_rowset($sql))
 		}
 		else
 		{
-			$www = '';
+			$www = $lang['NOSELECT'];
 		}
 
+        if(!$from)
+        {
+            $from = $lang['NOSELECT'];
+        }
+
 		$row_class = !($i % 2) ? 'row1' : 'row2';
 		$template->assign_block_vars('memberrow', array(
 			'ROW_NUMBER'    => $i + ( $start + 1 ),