diff --git a/erpnext/domains/education.py b/erpnext/domains/education.py
index 55e4eed..bbaa6e5 100644
--- a/erpnext/domains/education.py
+++ b/erpnext/domains/education.py
@@ -14,7 +14,7 @@
 		'Student Attendance Tool',
 		'Student Applicant'
 	],
-	'default_portal_role': 'LMS User',
+	'default_portal_role': 'Student',
 	'restricted_roles': [
 		'Student',
 		'Instructor',
diff --git a/erpnext/education/doctype/student/student.py b/erpnext/education/doctype/student/student.py
index 529f78d..da25880 100644
--- a/erpnext/education/doctype/student/student.py
+++ b/erpnext/education/doctype/student/student.py
@@ -54,7 +54,7 @@
 				'send_welcome_email': 1,
 				'user_type': 'Website User'
 				})
-			student_user.add_roles("Student", "LMS User")
+			student_user.add_roles("Student")
 			student_user.save()
 			update_password_link = student_user.reset_password()
 
diff --git a/erpnext/education/setup.py b/erpnext/education/setup.py
index ed1d69e..9d16ebe 100644
--- a/erpnext/education/setup.py
+++ b/erpnext/education/setup.py
@@ -9,7 +9,8 @@
 
 
 def setup_education():
-	if frappe.db.exists('Academic Year', '2015-16'):
+	disable_desk_access_for_student_role()
+	if frappe.db.exists("Academic Year", "2015-16"):
 		# already setup
 		return
 	create_academic_sessions()
@@ -26,3 +27,22 @@
 		{"doctype": "Academic Term", "academic_year": "2017-18", "term_name": "Semester 2"}
 	]
 	insert_record(data)
+
+def disable_desk_access_for_student_role():
+	try:
+		student_role = frappe.get_doc("Role", "Student")
+	except frappe.DoesNotExistError:
+		create_student_role()
+		return
+
+	student_role.desk_access = 0
+	student_role.save()
+
+def create_student_role():
+	student_role = frappe.get_doc({
+		"doctype": "Role",
+		"role_name": "Student",
+		"desk_access": 0,
+		"restrict_to_domain": "Education"
+	})
+	student.insert()