diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
index cbbc774..b5547d3 100644
--- a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
+++ b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
@@ -191,6 +191,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "eval:doc.get_students_from==\"Program Enrollments\"", 
    "fieldname": "new_program", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -217,6 +218,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "eval:doc.get_students_from==\"Program Enrollments\"", 
    "fieldname": "new_academic_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -275,7 +277,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 01:24:05.632746", 
+ "modified": "2016-08-17 07:50:40.399492", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program Enrollment Tool", 
diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py
index b483ef5..6c10880 100644
--- a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py
+++ b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py
@@ -6,6 +6,7 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from erpnext.schools.api import enroll_student
 
 class ProgramEnrollmentTool(Document):
 	def get_students(self):
@@ -29,11 +30,16 @@
 			
 	def enroll_students(self):
 		for stud in self.students:
-			prog_enrollment = frappe.new_doc("Program Enrollment")
-			prog_enrollment.student = stud.student
-			prog_enrollment.student_name = stud.student_name
-			prog_enrollment.program = self.new_program
-			prog_enrollment.academic_year = self.new_academic_year
-			prog_enrollment.save()
+			if stud.student:
+				prog_enrollment = frappe.new_doc("Program Enrollment")
+				prog_enrollment.student = stud.student
+				prog_enrollment.student_name = stud.student_name
+				prog_enrollment.program = self.new_program
+				prog_enrollment.academic_year = self.new_academic_year
+				prog_enrollment.save()
+			elif stud.student_applicant:
+				prog_enrollment = enroll_student(stud.student_applicant)
+				prog_enrollment.academic_year = self.academic_year
+				prog_enrollment.save()
 		frappe.msgprint("Students have been enrolled.")
 			
\ No newline at end of file