diff --git a/frappe/docs/user/guides/app_development/generating-docs.md b/frappe/docs/user/guides/app_development/generating-docs.md
index 1c8e616c19..ce6614873a 100644
--- a/frappe/docs/user/guides/app_development/generating-docs.md
+++ b/frappe/docs/user/guides/app_development/generating-docs.md
@@ -10,7 +10,6 @@ Frappe version 6.7 onwards includes a full-blown documentation generator so that
 
 The first step is to setup the docs folder. For that you must create a new file in your app `config/docs.py` if it is not auto-generated. In your `docs.py` file, add the following module properties.
 
-    from __future__ import unicode_literals
 
     source_link = "https://github.com/[orgname]/[reponame]"
     docs_base_url = "https://[orgname].github.io/[reponame]"
diff --git a/frappe/templates/pages/me.html b/frappe/templates/pages/me.html
index 913d259ce4..50779ffd48 100644
--- a/frappe/templates/pages/me.html
+++ b/frappe/templates/pages/me.html
@@ -10,10 +10,13 @@
 				<a href="/me"><img class="user-image" src="{{ user_image }}" /></a>
 			</div>
 			<div>
-				<h4><a href="/me">{{ fullname }}</a></h4>
+				<h4>{{ fullname }}</h4>
 				<ul class="list-unstyled">
 					<li><a href="/update-password">
                         <h6 class="text-muted">{{ _("Reset Password") }}</h6>
+                    </a></li>
+					<li><a href="/edit-profile">
+                        <h6 class="text-muted">{{ _("Edit Profile") }}</h6>
                     </a></li>
 					<li><a href="/?cmd=web_logout">
                         <h6 class="text-muted">{{ _("Logout") }}</h6>
diff --git a/frappe/utils/setup_docs.py b/frappe/utils/setup_docs.py
index d2e1d002bd..a4423ae934 100644
--- a/frappe/utils/setup_docs.py
+++ b/frappe/utils/setup_docs.py
@@ -120,7 +120,7 @@ class setup_docs(object):
 				context = self.app_context)
 
 		with open(os.path.join(self.docs_path, "license.html"), "w") as license_file:
-			license_file.write(html)
+			license_file.write(html.encode("utf-8"))
 
 		# contents
 		shutil.copy(os.path.join(frappe.get_app_path("frappe", "templates", "autodoc",