diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 77a75c14b2e..5864977eb38 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -464,7 +464,7 @@ Calendar={
 			},
 			submit:function(button, calendarid){
 				var displayname = $("#displayname_"+calendarid).val();
-				var active = $("#active_"+calendarid+":checked").length;
+				var active = $("#edit_active_"+calendarid+":checked").length;
 				var description = $("#description_"+calendarid).val();
 				var calendarcolor = $("#calendarcolor_"+calendarid).val();
 
diff --git a/apps/calendar/templates/part.editcalendar.php b/apps/calendar/templates/part.editcalendar.php
index a1a36505ee9..af555149120 100644
--- a/apps/calendar/templates/part.editcalendar.php
+++ b/apps/calendar/templates/part.editcalendar.php
@@ -25,8 +25,8 @@
 <tr>
 	<td></td>
 	<td>
-		<input id="active_<?php echo $_['calendar']['id'] ?>" type="checkbox"<?php echo $_['calendar']['active'] ? ' checked="checked"' : '' ?>>
-		<label for="active_<?php echo $_['calendar']['id'] ?>">
+		<input id="edit_active_<?php echo $_['calendar']['id'] ?>" type="checkbox"<?php echo $_['calendar']['active'] ? ' checked="checked"' : '' ?>>
+		<label for="edit_active_<?php echo $_['calendar']['id'] ?>">
 			<?php echo $l->t('Active') ?>
 		</label>
 	</td>