=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-14 10:17:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-14 12:49:33 +0000
@@ -58,37 +58,22 @@
                     </table>
                     
                     <div class="vertical-spacing">
-
                         <button type="button" 
                                 class="btn btn-primary"
-                                ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
                                 ng-click="completeEnrollment()">
                             {{'complete'| translate}}
                         </button>
                         <button type="button" 
                                 class="btn btn-warning"
-                                ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
                                 ng-click="cancelEnrollment()">
                             {{'cancel'| translate}}
-                        </button>   
-
+                        </button>
                         <button type="button"
-                                title="{{'unmark_for_followup'| translate}}"
-                                class="btn btn-danger horizonal-spacing"
-                                ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
-                                ng-if="selectedEnrollment.followup"
-                                ng-click="markForFollowup()">
-                            <i class="fa fa-exclamation-triangle"></i>
-                        </button>
-                        <button type="button" 
-                                title="{{'mark_for_followup'| translate}}"
-                                class="btn btn-default horizonal-spacing"
-                                ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
-                                ng-if="!selectedEnrollment.followup"
-                                ng-click="markForFollowup()">
-                            <i class="fa fa-exclamation-triangle"></i>
-                        </button>
-
+                                title="{{selectedEnrollment.followup ? 'unmark_for_followup' : 'mark_for_followup' | translate}}"
+                                ng-class="{true: 'btn btn-danger', false: 'btn btn-default'} [selectedEnrollment.followup]"
+                                ng-click="markForFollowup()">
+                            <i class="fa fa-exclamation-triangle"></i>
+                        </button>
                     </div>
                 </div>