diff --git a/settings/js/apps.js b/settings/js/apps.js
index 9ffa74c7d93..9782fafd2bd 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -178,22 +178,19 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		if(OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||
 			OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) {
 			page.find(".groups-enable").hide();
-			page.find("label[for='groups_enable-"+app.id+"']").hide();
-			page.find(".groups-enable").attr('checked', null);
+			page.find(".groups-enable__checkbox").attr('checked', null);
 		} else {
 			page.find('#group_select').val((app.groups || []).join('|'));
 			if (app.active) {
 				if (app.groups.length) {
 					OC.Settings.Apps.setupGroupsSelect(page.find('#group_select'));
-					page.find(".groups-enable").attr('checked','checked');
+					page.find(".groups-enable__checkbox").attr('checked','checked');
 				} else {
-					page.find(".groups-enable").attr('checked', null);
+					page.find(".groups-enable__checkbox").attr('checked', null);
 				}
 				page.find(".groups-enable").show();
-				page.find("label[for='groups_enable-"+app.id+"']").show();
 			} else {
 				page.find(".groups-enable").hide();
-				page.find("label[for='groups_enable-"+app.id+"']").hide();
 			}
 		}
 	},
@@ -227,8 +224,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					appItem.removeClass('active');
 					element.val(t('settings','Enable'));
 					element.parent().find(".groups-enable").hide();
-					element.parent().find("#groups_enable-"+appId).hide();
-					element.parent().find("label[for='groups_enable-"+appId+"']").hide();
 					element.parent().find('#group_select').hide().val(null);
 					OC.Settings.Apps.State.apps[appId].active = false;
 				}
@@ -265,15 +260,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					if (OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||
 						OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) {
 						element.parent().find(".groups-enable").attr('checked', null);
-						element.parent().find("#groups_enable-"+appId).hide();
-						element.parent().find("label[for='groups_enable-"+appId+"']").hide();
 						element.parent().find(".groups-enable").hide();
-						element.parent().find("#groups_enable-"+appId).hide();
-						element.parent().find("label[for='groups_enable-"+appId+"']").hide();
 						element.parent().find('#group_select').hide().val(null);
 					} else {
-						element.parent().find("#groups_enable-"+appId).show();
-						element.parent().find("label[for='groups_enable-"+appId+"']").show();
+						element.parent().find("#groups-enable").show();
 						if (groups) {
 							appItem.data('groups', JSON.stringify(groups));
 						} else {
@@ -550,8 +540,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			}
 		});
 
-		$(document).on('change', ".groups-enable", function() {
-			var $select = $(this).parent().find('#group_select');
+		$(document).on('change', ".groups-enable__checkbox", function() {
+			var $select = $(this).closest('.section').find('#group_select');
 			$select.val('');
 
 			if (this.checked) {
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index bb01d991e5e..1838465f9ce 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -111,8 +111,10 @@ script(
 	<input class="update hidden" type="submit" value="<?php p($l->t('Update to %s', array('{{update}}'))); ?>" data-appid="{{id}}" />
 	{{#if active}}
 	<input class="enable" type="submit" data-appid="{{id}}" data-active="true" value="<?php p($l->t("Disable"));?>"/>
-	<input type="checkbox" class="groups-enable" id="groups_enable-{{id}}"/>
-	<label for="groups_enable-{{id}}"><?php p($l->t('Enable only for specific groups')); ?></label>
+	<span class="groups-enable">
+		<input type="checkbox" class="groups-enable__checkbox checkbox" id="groups_enable-{{id}}"/>
+		<label for="groups_enable-{{id}}"><?php p($l->t('Enable only for specific groups')); ?></label>
+	</span>
 	<br />
 	<input type="hidden" id="group_select" title="<?php p($l->t('All')); ?>" style="width: 200px">
 	{{else}}