diff --git a/lms/www/batches/batch_details.html b/lms/www/batches/batch_details.html
index 5ed9fe76..b1967306 100644
--- a/lms/www/batches/batch_details.html
+++ b/lms/www/batches/batch_details.html
@@ -136,9 +136,9 @@
         {% endif %}
 
         <div class="mt-2">
-            {% if is_moderator or is_evaluator or is_student %}
+            {% if is_moderator or is_evaluator %}
             <a class="btn btn-primary wide-button" href="/batches/{{ batch_info.name }}">
-                {{ _("Checkout Batch") }}
+                {{ _("Manage Batch") }}
             </a>
             {% elif batch_info.paid_batch %}
             <a class="btn btn-primary wide-button {% if batch_info.seat_count and not seats_left %} hide {% endif %}"
diff --git a/lms/www/batches/batch_details.py b/lms/www/batches/batch_details.py
index 6707da54..91d11927 100644
--- a/lms/www/batches/batch_details.py
+++ b/lms/www/batches/batch_details.py
@@ -31,10 +31,15 @@ def get_context(context):
 
 	context.is_moderator = has_course_moderator_role()
 	context.is_evaluator = has_course_evaluator_role()
+	context.is_student = is_student(batch_name)
 
 	if not context.is_moderator and not context.batch_info.published:
 		raise frappe.PermissionError(_("You do not have permission to access this page."))
 
+	if context.is_student:
+		frappe.local.flags.redirect_location = f"/batches/{batch_name}"
+		raise frappe.Redirect
+
 	context.courses = frappe.get_all(
 		"Batch Course",
 		{"parent": batch_name},
@@ -51,5 +56,3 @@ def get_context(context):
 
 	context.student_count = frappe.db.count("Batch Student", {"parent": batch_name})
 	context.seats_left = context.batch_info.seat_count - context.student_count
-
-	context.is_student = is_student(batch_name)
diff --git a/lms/www/billing/billing.py b/lms/www/billing/billing.py
index 3c5558ce..e88af68c 100644
--- a/lms/www/billing/billing.py
+++ b/lms/www/billing/billing.py
@@ -24,7 +24,7 @@ def get_context(context):
 
 def validate_access(doctype, docname, module):
 	if frappe.session.user == "Guest":
-		raise frappe.PermissionError(_("You are not allowed to access this page."))
+		raise frappe.PermissionError(_("Please login to continue with payment."))
 
 	if module not in ["course", "batch"]:
 		raise ValueError(_("Module is incorrect."))