diff --git a/frappe/public/js/frappe/misc/common.js b/frappe/public/js/frappe/misc/common.js
index 0224bfe809..9715e1f847 100644
--- a/frappe/public/js/frappe/misc/common.js
+++ b/frappe/public/js/frappe/misc/common.js
@@ -27,7 +27,7 @@ frappe.avatar = function(user, css_class, title) {
 		return repl('<span class="avatar %(css_class)s" title="%(title)s">\
 			<span class="avatar-frame" style="background-image: url(%(image)s)"\
 			 title="%(title)s"></span></span>', {
-				image: image,
+				image: user_info.image,
 				title: title,
 				abbr: user_info.abbr,
 				css_class: css_class
diff --git a/frappe/templates/pages/me.html b/frappe/templates/pages/me.html
index 883e5806c6..4ce8fcc229 100644
--- a/frappe/templates/pages/me.html
+++ b/frappe/templates/pages/me.html
@@ -10,7 +10,13 @@
 		<div class="your-account-info">
 			<div class="avatar avatar-large">
 				<a href="/me">
-					<img class="user-image" src="{{ user_image }}" /></a>
+					{% if user_image -%}
+						<img class="user-image" src="{{ user_image }}" /></a>
+					{% else %}
+						{% block script %}
+							<script> $('.avatar-large').append($(frappe.avatar()).find('.standard-image')) </script>
+						{% endblock %}
+					{% endif -%}
 			</div>
 			<div>
 				<h4>{{ fullname }}</h4>