diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index 88c9b52231..c667ac1467 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -202,7 +202,7 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
 frappe.ui.form.update_calling_link = function(name) {
 	if(frappe._from_link) {
 		// set value
-		if (frappe._from_link.doc.parentfield){
+		if (frappe._from_link.doc && frappe._from_link.doc.parentfield){
 			//update values for child table
 			$.each(frappe._from_link.frm.fields_dict[frappe._from_link.doc.parentfield].grid.grid_rows, function(index, field) {
 				if(field.doc && field.doc.name===frappe._from_link.docname){
diff --git a/frappe/templates/includes/web_sidebar.html b/frappe/templates/includes/web_sidebar.html
index 2ad6d201b4..d4cb904b5b 100644
--- a/frappe/templates/includes/web_sidebar.html
+++ b/frappe/templates/includes/web_sidebar.html
@@ -28,9 +28,11 @@
 				</a>
 			</li>
 			{%- endfor %}
+			{% if frappe.user != 'Guest' %}
 			<li class="sidebar-item">
 				<a href="/me">My Account</a>
 			</li>
+			{% endif %}
 		</ul>
 		</div>
 </div>
diff --git a/frappe/website/context.py b/frappe/website/context.py
index ff04264157..cfd695b6b1 100644
--- a/frappe/website/context.py
+++ b/frappe/website/context.py
@@ -95,10 +95,8 @@ def build_context(context):
 
 	add_metatags(context)
 
-	if frappe.session.user == 'Guest':
-		context.show_sidebar = 0
-
 	if context.show_sidebar:
+		context.no_cache = 1
 		add_sidebar_data(context)
 
 	# determine templates to be used
diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json
index 133e4c0754..3c06541d91 100644
--- a/frappe/website/doctype/web_page/web_page.json
+++ b/frappe/website/doctype/web_page/web_page.json
@@ -223,7 +223,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "Page content", 
+   "description": "", 
    "fieldname": "sb1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -669,7 +669,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 20, 
- "modified": "2016-09-26 07:09:08.700666", 
+ "modified": "2016-10-03 07:50:38.069990", 
  "modified_by": "Administrator", 
  "module": "Website", 
  "name": "Web Page", 
@@ -685,6 +685,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
diff --git a/frappe/www/me.py b/frappe/www/me.py
index 3d56f672f2..63e57ca373 100644
--- a/frappe/www/me.py
+++ b/frappe/www/me.py
@@ -11,4 +11,7 @@ no_cache = 1
 no_sitemap = 1
 
 def get_context(context):
+	if frappe.session.user=='Guest':
+		frappe.throw(_("You need to be logged in to access this page"), frappe.PermissionError)
+
 	context.show_sidebar=True
\ No newline at end of file