diff --git a/frappe/templates/generators/web_form.html b/frappe/templates/generators/web_form.html
index 6d693f4792..32b013ef8f 100644
--- a/frappe/templates/generators/web_form.html
+++ b/frappe/templates/generators/web_form.html
@@ -11,11 +11,11 @@
 {% endblock %}
 
 {% block header_actions %}
-  {% if params.name or params.new %}
+  {% if frappe.form_dict.name or frappe.form_dict.new %}
     <a href="{{ cancel_url or pathname }}" class="btn btn-default btn-sm">
     		{{ _("Cancel") }}</a>
     <button type="submit" class="btn btn-primary btn-sm btn-form-submit">
-    		{{ _("Submit") if params.new else _("Update") }}</button>
+    		{{ _("Submit") if frappe.form_dict.new else _("Update") }}</button>
   {% elif is_list %}
   	<div style="padding-bottom: 15px;">
 	    <a href="/{{ pathname + args }}{{ delimeter }}new=1" class="btn btn-primary btn-new btn-sm">
@@ -143,7 +143,7 @@
 <div class="form-message text-muted hide"></div>
 <form role="form"
 	data-web-form="{{ name }}" data-owner="{{ doc.owner }}">
-	{% if params.name and web_page_link_text %}
+	{% if frappe.form_dict.name and web_page_link_text %}
 	<div class="row">
 		<div class="col-sm-9">
 			<p class="text-muted">
@@ -155,8 +155,8 @@
 	{% endif %}
 	<input type="hidden" name="web_form" value="{{ name }}">
 	<input type="hidden" name="doctype" value="{{ doc_type }}">
-	{% if params.name -%}
-	<input type="hidden" name="name" value="{{ params.name }}">
+	{% if frappe.form_dict.name -%}
+	<input type="hidden" name="name" value="{{ frappe.form_dict.name }}">
 	{%- endif %}
 
 		{% for section in layout %}
@@ -171,7 +171,7 @@
 		</div>
 		{% endfor %}
 </form>
-{% if allow_comments and not params.new -%}
+{% if allow_comments and not frappe.form_dict.new -%}
 <div class="comments">
 	<br><br>
 	<h3>{{ _("Comments") }}</h3>
@@ -276,7 +276,10 @@ frappe.ready(function() {
 							.html('{{ success_message }}<p><a href="{{ success_url }}">{{ _("Continue") }}</a></p>')
 							.removeClass("hide");
                     } else {
-						window.location.href = "{{ success_url }}";
+						frappe.msgprint(__('Successfully Updated. Redirecting...'));
+						setTimeout(function() {
+							window.location.href = "{{ success_url }}";
+						}, 3000);
 				    }
 			    }
 		    },
diff --git a/frappe/website/doctype/web_form/web_form.js b/frappe/website/doctype/web_form/web_form.js
index 67cdc59768..aea2cd5547 100644
--- a/frappe/website/doctype/web_form/web_form.js
+++ b/frappe/website/doctype/web_form/web_form.js
@@ -30,7 +30,7 @@ frappe.ui.form.on("Web Form", {
 	title: function(frm) {
 		if(frm.doc.__islocal) {
 			var page_name = frm.doc.title.toLowerCase().replace(/ /g, "-");
-			frm.set_value("page_name", page_name);
+			frm.set_value("route", page_name);
 			frm.set_value("success_url", "/" + page_name);
 		}
 	},
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index 46f7424b9a..cc4f1f0110 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -104,11 +104,10 @@ def get_context(context):
 		context.show_sidebar=True
 		from frappe.www.list import get_context as get_list_context
 
-		frappe.local.form_dict.is_web_form = 1
-		context.params = frappe.form_dict
+		frappe.form_dict.is_web_form = 1
 		logged_in = frappe.session.user != "Guest"
 
-		args, delimeter = make_route_string(frappe.local.form_dict)
+		args, delimeter = make_route_string(frappe.form_dict)
 		context.args = args
 		context.delimeter = delimeter
 
@@ -125,7 +124,7 @@ def get_context(context):
 		if self.login_required and logged_in:
 			if self.allow_edit:
 				if self.allow_multiple:
-					if not context.params.name and not context.params.new:
+					if not frappe.form_dict.name and not frappe.form_dict.new:
 						frappe.form_dict.doctype = self.doc_type
 						get_list_context(context)
 						context.is_list = True