diff --git a/erpnext/education/utils.py b/erpnext/education/utils.py
index acfa3884dbe..6fb72f1d5d8 100644
--- a/erpnext/education/utils.py
+++ b/erpnext/education/utils.py
@@ -100,11 +100,12 @@ def get_course_enrollment(course_name):
 		return None
 
 def create_student():
-	student_name=frappe.session.user
+	user = frappe.get_doc("User", frappe.session.user)
 	student = frappe.get_doc({
 		"doctype": "Student",
-		"first_name": student_name,
-		"student_email_id": student_name,
+		"first_name": user.first_name,
+		"last_name": user.last_name,
+		"student_email_id": user.email,
 		})
 	student.save(ignore_permissions=True)
 	frappe.db.commit()
diff --git a/erpnext/www/lms.py b/erpnext/www/lms.py
index 10d29480da5..505834c65a1 100644
--- a/erpnext/www/lms.py
+++ b/erpnext/www/lms.py
@@ -101,8 +101,6 @@ def get_quiz_without_answers(quiz_name):
 @frappe.whitelist()
 def evaluate_quiz(enrollment, quiz_response, quiz_name):
 	"""LMS Function: Evaluates a simple multiple choice quiz.
-
-
 	:param quiz_response: contains user selected choices for a quiz in the form of a string formatted as a dictionary. The function uses `json.loads()` to convert it to a python dictionary.
 	"""
 	
@@ -143,7 +141,7 @@ def add_quiz_activity(enrollment, quiz_name, result_data, score, status):
 @frappe.whitelist()
 def enroll_in_program(program_name):
 	if(not utils.get_current_student()):
-		utils.create_student(frappe.session.user)
+		utils.create_student()
 	student = frappe.get_doc("Student", utils.get_current_student())
 	program_enrollment = student.enroll_in_program(program_name)
 	utils.enroll_all_courses_in_program(program_enrollment, student)