diff --git a/admin/js/app.ts b/admin/js/app.ts
index 44f2a5f0b8..9fbabed671 100644
--- a/admin/js/app.ts
+++ b/admin/js/app.ts
@@ -1291,22 +1291,6 @@ class AdminApp extends EgwApp
 		this.et2.getWidgetById('acc_sieve_enabled').set_value(1);
 	}
 
-	/**
-	 * Switch to select multiple accounts
-	 *
-	 * @param {object} _event event-object or information about event
-	 * @param {et2_baseWidget} _widget widget causing the event
-	 */
-	edit_multiple(_event, _widget)
-	{
-		// hide multiple button
-		_widget.set_disabled(true);
-
-		// switch account-selection to multiple
-		var account_id = this.et2.getWidgetById('account_id');
-		account_id.set_multiple(true);
-	}
-
 	/**
 	 * Hide not applying fields, used as:
 	 * - onchange handler on account_id
@@ -1339,7 +1323,6 @@ class AdminApp extends EgwApp
 			{
 				// switch back to single selectbox
 				account_id.set_multiple(false);
-				this.et2.getWidgetById('button[multiple]').set_disabled(false);
 			}
 		}
 		// switched to single user
@@ -1584,4 +1567,4 @@ class AdminApp extends EgwApp
 	}
 }
 
-app.classes.admin = AdminApp;
+app.classes.admin = AdminApp;
\ No newline at end of file
diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet
index 0aac424c4e..61b16385fa 100644
--- a/admin/templates/default/mailaccount.xet
+++ b/admin/templates/default/mailaccount.xet
@@ -338,8 +338,7 @@
 				<row class="emailadmin_no_user dialogHeader2">
 					<description for="account_id" value="Valid for"/>
 					<hbox>
-						<select-account account_type="both" id="account_id" onchange="app.admin.account_hide_not_applying" empty_label="Everyone" multiple="dynamic"/>
-						<buttononly label="Select multiple" id="button[multiple]" onclick="app.admin.edit_multiple" options="users"/>
+						<select-account account_type="both" id="account_id" onchange="app.admin.account_hide_not_applying" empty_label="Everyone" expand_multiple_rows="4"/>
 						<checkbox label="account editable by user" id="acc_user_editable"/>
 					</hbox>
 					<description/>
@@ -377,4 +376,4 @@
 			<button align="right" label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')"  image="delete" background_image="1"/>
 		</hbox>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file