diff --git a/admin/inc/class.admin_mail.inc.php b/admin/inc/class.admin_mail.inc.php
index 7348dcabe6..3c78d91f75 100644
--- a/admin/inc/class.admin_mail.inc.php
+++ b/admin/inc/class.admin_mail.inc.php
@@ -1230,13 +1230,15 @@ class admin_mail
 		$sel_options['acc_further_identities'] = self::$further_identities;
 
 		// if only aliases are allowed for futher identities, add them as options
-		if ($content['acc_further_identities'] == 2)
+		// allow admins to always add arbitrary aliases
+		if ($content['acc_further_identities'] == 2 && !$this->is_admin)
 		{
 			$sel_options['ident_email_alias'] = array_merge(
 				array('' => $content['mailLocalAddress'].' ('.lang('Default').')'),
 				array_combine($content['mailAlternateAddress'], $content['mailAlternateAddress']));
 			// copy ident_email to select-box ident_email_alias, as et2 requires unique ids
 			$content['ident_email_alias'] = $content['ident_email'];
+			$content['select_ident_mail'] = true;
 		}
 
 		// user is allowed to create or edit further identities
diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet
index d546a354a4..9fb0605ee8 100644
--- a/admin/templates/default/mailaccount.xet
+++ b/admin/templates/default/mailaccount.xet
@@ -30,11 +30,11 @@
 					<description for="ident_org" value="Organisation"/>
 					<textbox id="ident_org" size="90" maxlength="128" span="all"/>
 				</row>
-				<row disabled="@acc_further_identities=2">
+				<row disabled="@select_ident_mail">
 					<description for="ident_email" value="EMail address"/>
 					<url-email id="ident_email" size="90" maxlength="128" span="all"/>
 				</row>
-				<row disabled="!@acc_further_identities=2">
+				<row disabled="!@selec_ident_mail">
 					<description for="ident_email_alias" value="EMail address"/>
 					<select id="ident_email_alias" span="all" class="et2_fullWidth"/>
 				</row>