diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js
index 24d6ef31..6574426c 100644
--- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js
+++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js
@@ -3,12 +3,15 @@
 
 frappe.ui.form.on('LMS Certificate Request', {
     refresh: function(frm) {
-        frm.add_custom_button(__("Create LMS Certificate Evaluation"), () => {
-            frappe.model.open_mapped_doc({
-                method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation",
-                frm: frm
+        console.log(frm)
+        if (frm.doc.status == "Pass") {
+            frm.add_custom_button(__("Create LMS Certificate Evaluation"), () => {
+                frappe.model.open_mapped_doc({
+                    method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation",
+                    frm: frm
+                });
             });
-        });
+        }
     },
 
     onload: function(frm) {
diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py
index b528e8ea..bcfaf1ef 100644
--- a/lms/www/courses/course.py
+++ b/lms/www/courses/course.py
@@ -1,6 +1,7 @@
 import frappe
 from lms.lms.doctype.lms_settings.lms_settings import check_profile_restriction
 from lms.lms.utils import get_membership, is_instructor, is_certified
+from frappe.utils import add_months, getdate
 
 def get_context(context):
     context.no_cache = 1
@@ -36,17 +37,18 @@ def get_context(context):
     context.certificate = is_certified(course.name)
     context.certificate_request = frappe.db.get_value("LMS Certificate Request", {
             "course": course.name,
-            "member": frappe.session.user
+            "member": frappe.session.user,
+            "date": [">=", getdate()]
         }, ["date", "start_time", "end_time"],
         as_dict=True)
 
     context.no_of_attempts = frappe.db.count("LMS Certificate Evaluation", {
         "course": course.name,
         "member": frappe.session.user,
-        "status" != "Pass",
-        "creation": [">=", add_days()]
+        "status": ["!=", "Pass"],
+        "creation": [">=", add_months(getdate(), -2)]
     })
-
+    print(context.certificate_request)
     if context.course.upcoming:
         context.is_user_interested = get_user_interest(context.course.name)