diff --git a/hr/doctype/job_applicant/job_applicant.js b/hr/doctype/job_applicant/job_applicant.js
index a63f833..c301250 100644
--- a/hr/doctype/job_applicant/job_applicant.js
+++ b/hr/doctype/job_applicant/job_applicant.js
@@ -1,6 +1,13 @@
 // For license information, please see license.txt
 
 cur_frm.cscript = {
+	onload: function(doc, dt, dn) {
+		if(in_list(user_roles,'System Manager')) {
+			cur_frm.page_layout.footer.help_area.innerHTML = '<hr>\
+				<p><a href="#Form/Jobs Email Settings">Jobs Email Settings</a><br>\
+				<span class="help">Automatically extract Job Applicants from a mail box e.g. "jobs@example.com"</span></p>';
+		}
+	},
 	refresh: function(doc) {
 		cur_frm.cscript.make_listing(doc);
 	},
diff --git a/hr/page/hr_home/hr_home.js b/hr/page/hr_home/hr_home.js
index c2c5cd9..e26cbd3 100644
--- a/hr/page/hr_home/hr_home.js
+++ b/hr/page/hr_home/hr_home.js
@@ -31,6 +31,11 @@
 				description: wn._("Performance appraisal."),
 				doctype:"Appraisal"
 			},
+			{
+				label: wn._("Job Applicant"),
+				description: wn._("Applicant for a Job (extracted from jobs email)."),
+				doctype:"Job Applicant"
+			},
 		]
 	},
 	{
@@ -109,6 +114,11 @@
 		icon: "icon-cog",
 		items: [
 			{
+				label: wn._("Job Opening"),
+				description: wn._("Opening for a Job."),
+				doctype:"Job Opening"
+			},
+			{
 				"label": wn._("Employment Type"),
 				"description": wn._("Type of employment master."),
 				doctype: "Employment Type"
diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js
index 9dd64de..d8d322d 100644
--- a/selling/doctype/lead/lead.js
+++ b/selling/doctype/lead/lead.js
@@ -48,6 +48,12 @@
 	if(cur_frm.fields_dict.contact_by.df.options.match(/^Profile/)) {
 		cur_frm.fields_dict.contact_by.get_query = erpnext.utils.profile_query;
 	}
+
+	if(in_list(user_roles,'System Manager')) {
+		cur_frm.page_layout.footer.help_area.innerHTML = '<hr>\
+			<p><a href="#Form/Sales Email Settings">Sales Email Settings</a><br>\
+			<span class="help">Automatically extract Leads from a mail box e.g. "sales@example.com"</span></p>';
+	}
 }
 
 cur_frm.cscript.refresh_custom_buttons = function(doc) {
diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js
index f9c8796..aa75893 100644
--- a/setup/page/setup/setup.js
+++ b/setup/page/setup/setup.js
@@ -117,6 +117,18 @@
 				"description":wn._("Out going mail server and support ticket mailbox")
 			},
 			{
+				"route":"Form/Sales Email Settings",
+				doctype:"Sales Email Settings",
+				label: wn._("Sales Email Settings"),
+				"description":wn._("Extract Leads from sales email id e.g. sales@example.com")
+			},
+			{
+				"route":"Form/Jobs Email Settings",
+				doctype:"Jobs Email Settings",
+				label: wn._("Jobs Email Settings"),
+				"description":wn._("Extract Job Applicant from jobs email id e.g. jobs@example.com")
+			},
+			{
 				"route":"Form/Notification Control/Notification Control",
 				doctype:"Notification Control",
 				label: wn._("Notification Control"),
