1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html
index cc016afd67..9ea7d9904d 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html
@@ -1,10 +1,13 @@
 <div class="checkbox">
-    <input ng-model="formField.value"
-           piwik-attributes="{{formField.uiControlAttributes}}"
-           ng-value="1"
-           type="checkbox"
-           id="{{ formField.name }}"
-           name="{{ formField.name }}">
+    <label>
+        <input ng-model="formField.value"
+               piwik-attributes="{{formField.uiControlAttributes}}"
+               ng-value="1"
+               ng-checked="!!formField.value"
+               type="checkbox"
+               id="{{ formField.name }}"
+               name="{{ formField.name }}">
 
-    <label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
+        <span ng-bind-html="formField.title"></span>
+    </label>
 </div>
 \ No newline at end of file