diff --git a/erpnext/schools/doctype/student_admission/student_admission.py b/erpnext/schools/doctype/student_admission/student_admission.py
index 3df113a..b0c7b55 100644
--- a/erpnext/schools/doctype/student_admission/student_admission.py
+++ b/erpnext/schools/doctype/student_admission/student_admission.py
@@ -15,14 +15,15 @@
 	)
 
 	def autoname(self):
-		self.name = self.get_title()
-		self.title = self.name
+		if not self.title:
+			self.title = self.get_title()
+		self.name = self.title
 
 	def get_context(self, context):
 		context.parents = [{'name': 'admissions', 'title': _('All Student Admissions') }]
 
 	def get_title(self):
-		return _("Admissions for {0}") + self.academic_year
+		return _("Admissions for {0}").format(self.academic_term)
 
 def get_list_context(context):
 	context.title = _("Student Admissions")
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant_list.js b/erpnext/schools/doctype/student_applicant/student_applicant_list.js
index cafb2b3..817a728 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant_list.js
+++ b/erpnext/schools/doctype/student_applicant/student_applicant_list.js
@@ -3,7 +3,7 @@
 	has_indicator_for_draft: 1,
 	get_indicator: function(doc) {
 		if (doc.paid) {
-			return [__("Paid"), "green", "paid,=,1"];
+			return [__("Paid"), "green", "paid,=,Yes"];
 		}
 		else if (doc.application_status=="Applied") {
 			return [__("Applied"), "orange", "application_status,=,Applied"];