diff --git a/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/edit-category.html b/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/edit-category.html
index 83a4014fea..895a1d1e23 100644
--- a/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/edit-category.html
+++ b/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/edit-category.html
@@ -118,6 +118,16 @@ <h5><strong>Restrict check-in to a specific timeslot</strong></h5>
         </div>
     </div>
 
+    <div class="row" data-ng-if="checkInStrategiesVisible()">
+        <div class="col-xs-12">
+            <div class="form-group" bs-form-error="ticketCategory.ticketCheckInStrategy">
+                <label for="{{buildPrefix($index, 'ticketCheckInStrategy')}}">Check-in is allowed</label>
+                <select class="form-control" id="{{buildPrefix($index, 'ticketCheckInStrategy')}}" name="ticketCheckInStrategy" ng-model="ticketCategory.ticketCheckInStrategy" ng-options="strategy.id as strategy.name for strategy in checkInStrategies">
+                </select>
+            </div>
+        </div>
+    </div>
+
     <h5><strong>Custom ticket validity</strong> <small>(will be displayed in ticket PDF, email and calendar invitation)</small></h5>
 
     <div class="row">
diff --git a/src/main/webapp/resources/js/admin/directive/admin-directive.js b/src/main/webapp/resources/js/admin/directive/admin-directive.js
index 70b1704938..3f6bcc2db3 100644
--- a/src/main/webapp/resources/js/admin/directive/admin-directive.js
+++ b/src/main/webapp/resources/js/admin/directive/admin-directive.js
@@ -593,6 +593,25 @@
                 };
 
                 $scope.advancedOptionsCollapsed = !hasCustomCheckIn($scope.ticketCategory) && !hasCustomTicketValidity($scope.ticketCategory);
+
+                $scope.checkInStrategiesVisible = function() {
+                    var event = $scope.event;
+                    if(event.begin.date && event.end.date) {
+                        return moment(event.end.date).diff(moment(event.begin.date), 'days') > 0;
+                    }
+                    return moment(event.end).endOf('day').diff(moment(event.begin).startOf('day'), 'days') > 0;
+                };
+
+                $scope.checkInStrategies = [
+                    {
+                        id: 'ONCE_PER_EVENT',
+                        name: 'Only upon first access to the venue'
+                    },
+                    {
+                        id: 'ONCE_PER_DAY',
+                        name: 'Once per day'
+                    }
+                ];
             }
         };
     });
diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js
index c2c8c509f0..6242d20495 100644
--- a/src/main/webapp/resources/js/admin/ng-app/admin-application.js
+++ b/src/main/webapp/resources/js/admin/ng-app/admin-application.js
@@ -1081,6 +1081,7 @@
                 ticketValidityStart: ticketValidityStart,
                 ticketValidityEnd: ticketValidityEnd,
                 tokenGenerationRequested: category.accessRestricted,
+                ticketCheckInStrategy: category.ticketCheckInStrategy,
                 sticky: false
             };