=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js	2015-04-23 15:18:14 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js	2015-04-24 12:19:02 +0000
@@ -160,8 +160,15 @@
                             }
                             else{
                                 enrollment.enrollment = data.reference;
-                                $scope.selectedEnrollment = enrollment;
-                                notifyRegistrtaionCompletion(destination, $scope.tei.trackedEntityInstance);
+                                $scope.selectedEnrollment = enrollment;                                                                
+                                var dhis2Events = EventUtils.autoGenerateEvents($scope.tei.trackedEntityInstance, $scope.selectedProgram, $scope.selectedOrgUnit, enrollment);
+                                if(dhis2Events.events.length > 0){
+                                    DHIS2EventFactory.create(dhis2Events).then(function(data){
+                                        notifyRegistrtaionCompletion(destination, $scope.tei.trackedEntityInstance);
+                                    });
+                                }else{
+                                    notifyRegistrtaionCompletion(destination, $scope.tei.trackedEntityInstance);
+                                }                            
                             }
                         });
                     }