diff --git a/frappe/templates/includes/login/login.css b/frappe/templates/includes/login/login.css
index 8c656046fb..dc9f487659 100644
--- a/frappe/templates/includes/login/login.css
+++ b/frappe/templates/includes/login/login.css
@@ -97,4 +97,36 @@ p {
 .login-content .btn {
 	font-size: 14px;
 	margin-top: 45px;
+}
+
+.page-card {
+  max-width: 360px;
+  padding: 15px;
+  margin: 70px auto;
+  border: 1px solid #d1d8dd;
+  border-radius: 4px;
+  background-color: #fff;
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1);
+}
+.page-card .page-card-head {
+  padding: 10px 15px;
+  margin: -15px;
+  margin-bottom: 15px;
+  border-bottom: 1px solid #d1d8dd;
+}
+.page-card .page-card-head .indicator {
+  color: #36414C;
+  font-size: 14px;
+}
+.page-card .page-card-head .indicator::before {
+  margin: 0 6px 0.5px 0px;
+}
+.page-card .btn {
+  margin-top: 30px;
+}
+
+.bordered {
+	border: 1px solid  #d1d8dd;
+	padding: 10px;
+	border-radius: 4px;
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html
index 1b8c9aadc7..1c92dc5376 100644
--- a/frappe/website/doctype/web_form/templates/web_form.html
+++ b/frappe/website/doctype/web_form/templates/web_form.html
@@ -33,7 +33,7 @@
 	    </a>
 	</div>
 	{% endif %}
-	{%- if allow_print and not is_list and not _login_required -%}
+	{%- if allow_print and not is_list and not _login_required and doc.name -%}
 	<div class='text-right'>
 		<a class='text-muted small' href='/printview?doctype={{ doc.doctype}}&name={{ doc.name }}
 			{%- if print_format -%}&format={{ print_format }}{%- endif -%}' target="_blank" rel="noopener noreferrer">
diff --git a/frappe/website/js/web_form.js b/frappe/website/js/web_form.js
index 892d7c0caa..b46f50a878 100644
--- a/frappe/website/js/web_form.js
+++ b/frappe/website/js/web_form.js
@@ -72,6 +72,7 @@ frappe.ready(function() {
 	};
 
 	function save(data, for_payment) {
+		if(!data) return;
 		if(window.saving)
 			return false;
 		window.saving = true;
diff --git a/frappe/website/js/webform.js b/frappe/website/js/webform.js
index 3fbe710077..ee4a114217 100644
--- a/frappe/website/js/webform.js
+++ b/frappe/website/js/webform.js
@@ -57,22 +57,23 @@ export default class WebForm {
 			return df;
 		});
 
-		this.fieldGroup = new frappe.ui.FieldGroup({
+		this.field_group = new frappe.ui.FieldGroup({
 			parent: this.wrapper,
 			fields: web_form.web_form_fields
 		});
 
-		this.fieldGroup.make();
+		this.field_group.make();
 
 		this.wrapper.find(".form-column").unwrap(".section-body");
 
 		if(doc) {
-			this.fieldGroup.set_values(doc);
+			this.field_group.set_values(doc);
 		}
 	}
 
 	get_values() {
-		let values = this.fieldGroup.get_values(this.allow_incomplete);
+		let values = this.field_group.get_values(this.allow_incomplete);
+		if (!values) return null;
 		values.doctype = this.doctype;
 		values.name = this.docname;
 		values.web_form_name = this.web_form_name;