diff --git a/admin/js/app.js b/admin/js/app.js
index 2d3d29e279..b037d9eb5c 100644
--- a/admin/js/app.js
+++ b/admin/js/app.js
@@ -560,9 +560,10 @@ app.classes.admin = AppJS.extend(
 				// Only send the request if they entered everything (or selected no apps)
 				if(_value.acl_account && (_value.acl_appname && _value.acl_location || typeof _value.apps != 'undefined'))
 				{
+					var id = [];
 					if(_value.acl_appname && _value.acl_account && _value.acl_location)
 					{
-						var id = _value.acl_appname+':'+_value.acl_account+':'+_value.acl_location;
+						id = _value.acl_appname+':'+_value.acl_account+':'+_value.acl_location;
 						if(content && content.id && id != content.id)
 						{
 							// Changed the account or location, remove previous or we
@@ -570,9 +571,9 @@ app.classes.admin = AppJS.extend(
 							this.egw.json(className+'::ajax_change_acl', [content.id, 0], null,this,false,this)
 								.sendRequest();
 						}
+						id = [id];
 					}
 					var rights = 0;
-					var id = [];
 					for(var i in _value.acl)
 					{
 						rights += parseInt(_value.acl[i]);
diff --git a/admin/templates/default/acl.edit.xet b/admin/templates/default/acl.edit.xet
index 35cc39ae94..9f72244019 100644
--- a/admin/templates/default/acl.edit.xet
+++ b/admin/templates/default/acl.edit.xet
@@ -12,13 +12,15 @@
 				<row disabled="@acl_location=run" part="header">
 					<description value="Application"/>
 					<menulist>
-						<menupopup id="acl_appname" needed="1" onchange="app.admin.acl_reopen_dialog" options="Select one"/>
+						<!-- app.admin doesn't exist (for unknown reason), but accessing it through etemplate2 works -->
+						<menupopup id="acl_appname" needed="1" onchange="etemplate2.getById('admin-acl').app_obj.admin.acl_reopen_dialog" options="Select one"/>
 					</menulist>
 				</row>
 				<row part="header">
 					<description value="Data from" for="acl_account"/>
 					<menulist>
-						<menupopup type="select-account" id="acl_account" account_type="both" needed="1" onchange="app.admin.acl_reopen_dialog"/>
+						<!-- app.admin doesn't exist (for unknown reason), but accessing it through etemplate2 works -->
+						<menupopup type="select-account" id="acl_account" account_type="both" needed="1" onchange="etemplate2.getById('admin-acl').app_obj.admin.acl_reopen_dialog"/>
 					</menulist>
 				</row>
 				<row disabled="@acl_location=run" part="header">