diff --git a/erpnext/education/doctype/course_activity/course_activity.json b/erpnext/education/doctype/course_activity/course_activity.json
index 99ae9aee56..3e23c90da0 100644
--- a/erpnext/education/doctype/course_activity/course_activity.json
+++ b/erpnext/education/doctype/course_activity/course_activity.json
@@ -30,7 +30,7 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Enrollment",
+   "label": "Course Enrollment",
    "length": 0,
    "no_copy": 0,
    "options": "Course Enrollment",
@@ -298,4 +298,4 @@
  "track_changes": 1,
  "track_seen": 0,
  "track_views": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/education/doctype/program_course/program_course.json b/erpnext/education/doctype/program_course/program_course.json
index 3465040415..a24e88a861 100644
--- a/erpnext/education/doctype/program_course/program_course.json
+++ b/erpnext/education/doctype/program_course/program_course.json
@@ -5,6 +5,7 @@
  "engine": "InnoDB",
  "field_order": [
   "course",
+  "course_name",
   "required"
  ],
  "fields": [
@@ -16,6 +17,14 @@
    "label": "Course",
    "options": "Course",
    "reqd": 1
+  },
+   {
+   "fieldname": "course_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Course Name",
+   "fetch_from": "course.course_name",
+   "read_only":1
   },
   {
    "default": "0",
@@ -36,4 +45,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/education/doctype/student_applicant/student_applicant.json b/erpnext/education/doctype/student_applicant/student_applicant.json
index 71134e0907..e5d0bd37de 100644
--- a/erpnext/education/doctype/student_applicant/student_applicant.json
+++ b/erpnext/education/doctype/student_applicant/student_applicant.json
@@ -705,7 +705,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "INDIAN", 
    "fieldname": "nationality", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1231,4 +1230,4 @@
  "track_changes": 0, 
  "track_seen": 0, 
  "track_views": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
index 16933dcfe0..c0a73596ac 100644
--- a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
+++ b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
@@ -55,7 +55,7 @@ def preview_report_card(doc):
 			"courses": courses,
 			"assessment_groups": assessment_groups,
 			"course_criteria": course_criteria,
-			"letterhead": letterhead.content,
+			"letterhead": letterhead and letterhead.get('content', None),
 			"add_letterhead": doc.add_letterhead if doc.add_letterhead else 0
 		})
 	final_template = frappe.render_template(base_template_path, {"body": html, "title": "Report Card"})
@@ -89,4 +89,4 @@ def get_attendance_count(student, academic_year, academic_term=None):
 			attendance["Present"] = 0
 		return attendance
 	else:
-		frappe.throw(_("Provide the academic year and set the starting and ending date."))
\ No newline at end of file
+		frappe.throw(_("Provide the academic year and set the starting and ending date."))