diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index 1e9ded3a1c..d8d7278a03 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -787,7 +787,7 @@ frappe.ui.form.ControlAttach = frappe.ui.form.ControlData.extend({
 			this.frm.attachments.update_attachment(attachment);
 		} else {
 			this.set_input(this.fileobj.filename, this.dataurl);
-			//this.refresh();
+			this.refresh();
 		}
 	},
 });
diff --git a/frappe/templates/generators/web_form.html b/frappe/templates/generators/web_form.html
index 099083fc03..d306770fa3 100644
--- a/frappe/templates/generators/web_form.html
+++ b/frappe/templates/generators/web_form.html
@@ -43,7 +43,7 @@
 
 {%- macro properties(field) %}name="{{ field.fieldname }}" id="{{ field.fieldname }}" {% if field.placeholder %}placeholder="{{ field.placeholder }}"{% endif %} data-label="{{ field.label }}" data-fieldtype="{{ field.fieldtype }}" {{ (field.reqd and field.fieldtype!="Attach") and "required" or "" }} {{ field.read_only and "disabled" or "" }}{% endmacro -%}
 
-{%- macro value(field) -%}{% if doc %}{{ doc.get(field.fieldname) or "" }}{% else %}{{ getCookie(field.options) or "" }}{% endif %}{%- endmacro -%}
+{%- macro value(field) -%}{% if doc %}{{ doc.get(field.fieldname) or field.default or "" }}{% else %}{{ getCookie(field.options) or field.default or "" }}{% endif %}{%- endmacro -%}
 
 {%- macro help(field) -%}
 {% if field.description -%}
diff --git a/frappe/templates/includes/login/login.css b/frappe/templates/includes/login/login.css
index 56687b354e..84bc3bccae 100644
--- a/frappe/templates/includes/login/login.css
+++ b/frappe/templates/includes/login/login.css
@@ -15,7 +15,6 @@
   max-width: 360px;
   padding: 30px;
   margin: 0 auto;
-  border: 1px solid #d1d8dd;
   border-radius: 5px;
   background-color: #fff;
 }
diff --git a/frappe/templates/pages/login.html b/frappe/templates/pages/login.html
index 85b0efc4dc..9a556d1b5b 100644
--- a/frappe/templates/pages/login.html
+++ b/frappe/templates/pages/login.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <!-- no-header -->
-<div class="login-content container" style="max-width: 800px; padding-top: 30px;">
+<div class="login-content container" style="max-width: 800px; padding-top: 30px; padding-bottom:15px">
 	<form class="form-signin form-login" role="form">
 		{%- if social_login -%}
 		<h4 class="form-signin-heading text-center">{{ _("Sign in using") }}</h4>
diff --git a/frappe/templates/pages/website_theme.css b/frappe/templates/pages/website_theme.css
index 4bc206fa16..33bad7b236 100644
--- a/frappe/templates/pages/website_theme.css
+++ b/frappe/templates/pages/website_theme.css
@@ -70,6 +70,10 @@ a:active {
 	border-top: 1px solid {{ border_color }};
 }
 
+.border-color {
+	border-color: {{ border_color }};
+}
+
 {% if theme.css -%} {% include theme.css %} {%- endif %}
 
 {%- endif -%}