diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php
index 8500b29e7f..e743eba69d 100644
--- a/phpBB/adm/admin_board.php
+++ b/phpBB/adm/admin_board.php
@@ -470,9 +470,13 @@ switch ($mode)
 		$smtp_yes = ($new['smtp_delivery']) ? 'checked="checked"' : '';
 		$smtp_no = (!$new['smtp_delivery']) ? 'checked="checked"' : '';
 
-		$smtp_auth_plain = ($new['smtp_auth_method'] == 'PLAIN' || !$new['smtp_auth_method']) ? 'checked="checked"' : '';
-		$smtp_auth_login = ($new['smtp_auth_method'] == 'LOGIN') ? 'checked="checked"' : '';
+		$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP');
+		$s_smtp_auth_options = '';
 
+		foreach ($auth_methods as $method)
+		{
+			$s_smtp_auth_options .= '<option value="' . $method . '"' . (($new['smtp_auth_method'] == $method) ? ' selected="selected"' : '') . '>' . $user->lang['SMTP_' . str_replace('-', '_', $method)] . '</option>';
+		}
 ?>
 	<tr>
 		<td class="row1"><b><?php echo $user->lang['ENABLE_EMAIL']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['ENABLE_EMAIL_EXPLAIN']; ?></span></td>
@@ -516,7 +520,7 @@ switch ($mode)
 	</tr>
 	<tr>
 		<td class="row1"><b><?php echo $user->lang['SMTP_AUTH_METHOD']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['SMTP_AUTH_METHOD_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="radio" name="smtp_auth_method" value="PLAIN" <?php echo $smtp_auth_plain; ?> /> <?php echo $user->lang['SMTP_PLAIN']; ?>&nbsp;&nbsp;<input type="radio" name="smtp_auth_method" value="LOGIN" <?php echo $smtp_auth_login; ?> /> <?php echo $user->lang['SMTP_LOGIN']; ?></td>
+		<td class="row2"><select name="smtp_auth_method"><?php echo $s_smtp_auth_options; ?></select></td>
 	</tr>
 	<tr>
 		<td class="row1"><b><?php echo $user->lang['SMTP_USERNAME']; ?>: </b><br /><span class="gensmall"><?php echo $user->lang['SMTP_USERNAME_EXPLAIN']; ?></span></td>
diff --git a/phpBB/adm/admin_email.php b/phpBB/adm/admin_email.php
index 716b2b7830..0b7f6ce07c 100644
--- a/phpBB/adm/admin_email.php
+++ b/phpBB/adm/admin_email.php
@@ -20,7 +20,7 @@ if (!empty($setmodules))
 
 define('IN_PHPBB', 1);
 // Include files
-$phpbb_root_path = '../';
+$phpbb_root_path = './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
@@ -81,11 +81,16 @@ if (isset($_POST['submit']))
 		$email_list = array();
 		do
 		{
-			$email_list[$row['user_lang']][$i]['method'] = $row['user_notify_type'];
-			$email_list[$row['user_lang']][$i]['email'] = $row['user_email'];
-			$email_list[$row['user_lang']][$i]['name'] = $row['username'];
-			$email_list[$row['user_lang']][$i]['jabber'] = $row['user_jabber'];
-			$i++;
+			if (($row['user_notify'] == NOTIFY_EMAIL && $row['user_email']) ||
+				($row['user_notify'] == NOTIFY_IM && $row['user_jabber']) ||
+				($row['user_notify'] == NOTIFY_BOTH && $row['user_email'] && $row['user_jabber']))
+			{
+				$email_list[$row['user_lang']][$i]['method'] = $row['user_notify_type'];
+				$email_list[$row['user_lang']][$i]['email'] = $row['user_email'];
+				$email_list[$row['user_lang']][$i]['name'] = $row['username'];
+				$email_list[$row['user_lang']][$i]['jabber'] = $row['user_jabber'];
+				$i++;
+			}
 		} 
 		while ($row = $db->sql_fetchrow($result));
 		$db->sql_freeresult($result);
@@ -175,7 +180,7 @@ adm_page_header($user->lang['MASS_EMAIL']);
 
 <p><?php echo $user->lang['MASS_EMAIL_EXPLAIN']; ?></p>
 
-<form method="post" action="<?php echo "admin_email.$phpEx.$SID"; ?>" name="email"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="post" action="<?php echo "admin_email.$phpEx$SID"; ?>" name="email"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
 	<tr>
 		<th colspan="2"><?php echo $user->lang['COMPOSE']; ?></th>
 	</tr>