diff --git a/school/job/doctype/job_opportunity/job_opportunity.py b/school/job/doctype/job_opportunity/job_opportunity.py
index 3812910e..c47a06d0 100644
--- a/school/job/doctype/job_opportunity/job_opportunity.py
+++ b/school/job/doctype/job_opportunity/job_opportunity.py
@@ -12,14 +12,15 @@ class JobOpportunity(Document):
 
 @frappe.whitelist()
 def report(job, reason):
+    system_managers = get_system_managers(only_name=True)
+    subject = _("User {0} has reported the job post {1}").format(user, job)
+    user = frappe.db.get_value("User", frappe.session.user, "full_name")
     args = {
         "job": job,
         "job_url": get_link_to_form("Job Opportunity", job),
-        "user": frappe.session.user
+        "user": user,
+        "reason": reason
     }
-    system_managers = get_system_managers(only_name=True)
-    user = frappe.db.get_value("User", frappe.session.user, "full_name")
-    subject = _("User {0} has reported the job post {1}").format(user, job)
     frappe.sendmail(
         recipients = system_managers,
         subject=subject,
diff --git a/school/templates/emails/job_report.html b/school/templates/emails/job_report.html
index 82896d36..ff067b39 100644
--- a/school/templates/emails/job_report.html
+++ b/school/templates/emails/job_report.html
@@ -1,7 +1,6 @@
 {% set job_link = "<a href='" + job_url + "'>" + job + "</a>" %}
 
-
 <p>{{ _("Hey,") }}</p>
 <p>{{ _("{0} has reported a job post for the following reason.").format(user) }}</p>
 <p>{{ reason }}</p>
-<p>{{ _("Please take appropriate action at {0}").format(job_link) }}</p>
+<p>{{ _("Please take appropriate action at {0}").format(job_url) }}</p>
diff --git a/school/www/jobs/job.js b/school/www/jobs/job.js
index 9dcc77b1..592eeceb 100644
--- a/school/www/jobs/job.js
+++ b/school/www/jobs/job.js
@@ -21,7 +21,8 @@ const report = (e) => {
       "reason": $(".report-field").val()
     },
     callback: (data) => {
-      frappe.msgprint(__("Thanks for informing us about this post. Site admins will look into this and take an appropriate action soon."))
+      $(".report-modal").modal("hide");
+      frappe.msgprint(__("Thanks for informing us about this post. The Admins will look into this and take an appropriate action soon."))
     }
   })
 }