diff --git a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
index a3a9fbfba2..28e972cc9f 100644
--- a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
+++ b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
@@ -11,7 +11,7 @@ from frappe.model.document import Document
 class OutgoingEmailSettings(Document):
 
 	def validate(self):
-		if self.mail_server:
+		if self.mail_server and not frappe.local.flags.in_patch:
 			from frappe.utils import cint
 			from frappe.utils.email_lib.smtp import SMTPServer
 			smtpserver = SMTPServer(login = self.mail_login,
diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js
index 62d392e056..9be0deed80 100644
--- a/frappe/website/doctype/blog_post/blog_post.js
+++ b/frappe/website/doctype/blog_post/blog_post.js
@@ -11,8 +11,9 @@ cur_frm.cscript.refresh = function(doc) {
 			});
 		}
 
-		cur_frm.appframe.add_button("View In Website", function() {
-			window.open(doc.__onload.website_route);
-		}, "icon-globe");
+		if (!doc.__islocal && doc.published) {
+			cur_frm.set_intro(__("Published on website at: {0}",
+				[repl('<a href="/%(website_route)s" target="_blank">/%(website_route)s</a>', doc.__onload)]));
+		}
 	}
 }
diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js
index a94c157544..7af771da2f 100644
--- a/frappe/website/doctype/web_page/web_page.js
+++ b/frappe/website/doctype/web_page/web_page.js
@@ -18,10 +18,9 @@ $.extend(cur_frm.cscript, {
 	},
 	refresh: function(doc) {
 		cur_frm.cscript.layout(doc);
-		if(!doc.__islocal && doc.published) {
-			cur_frm.appframe.add_button("View In Website", function() {
-				window.open(doc.__onload.website_route);
-			}, "icon-globe");
+		if (!doc.__islocal && doc.published) {
+			cur_frm.set_intro(__("Published on website at: {0}",
+				[repl('<a href="/%(website_route)s" target="_blank">/%(website_route)s</a>', doc.__onload)]));
 		}
 	},
 	insert_style: function(doc) {