diff --git a/frappe/core/page/modules_setup/includes/module_icons.html b/frappe/core/page/modules_setup/includes/module_icons.html
index 3d52df819a..fd57ef32b3 100644
--- a/frappe/core/page/modules_setup/includes/module_icons.html
+++ b/frappe/core/page/modules_setup/includes/module_icons.html
@@ -4,11 +4,10 @@
 	  <div class="checkbox">
 	    <label>
 	      <input type="checkbox" data-module="{{ icon.module_name }}"
-					{% if not icon.hidden %}checked{% endif %}>
+					{% if not (icon.hidden if user else icon.blocked) %}checked{% endif %}>
 					{{ _(icon.label or icon.module_name) }}
 	    </label>
 	  </div>
-
 	</div>
 {% endfor %}
 </div>
diff --git a/frappe/core/page/modules_setup/modules_setup.html b/frappe/core/page/modules_setup/modules_setup.html
index 841da30b22..ac59d12a71 100644
--- a/frappe/core/page/modules_setup/modules_setup.html
+++ b/frappe/core/page/modules_setup/modules_setup.html
@@ -15,7 +15,7 @@
 					{% if user.name == frappe.user %}selected{% endif %}>
 					<!-- {{ variable | e }} "e" or "escape(s)" will escape the characters such "<, >, &, '"
 					in the HTML text (http://jinja.pocoo.org/docs/dev/templates/#escape) -->
-					{{ user.first_name | e or "" }} {{ user.last_name | e or "" }} ({{ user.name }})</option>
+					{{ (user.first_name or "") | e }} {{ (user.last_name or "") | e }} ({{ user.name }})</option>
 				{% endfor %}
 			</select>
 		</div>
diff --git a/frappe/core/page/modules_setup/modules_setup.py b/frappe/core/page/modules_setup/modules_setup.py
index fd64281688..10b41f9e90 100644
--- a/frappe/core/page/modules_setup/modules_setup.py
+++ b/frappe/core/page/modules_setup/modules_setup.py
@@ -17,6 +17,7 @@ def update(hidden_list, user=None):
 
 def get_context(context):
 	context.icons = get_user_icons(frappe.session.user)
+	context.user = frappe.session.user
 
 	if 'System Manager' in frappe.get_roles():
 		context.users = frappe.db.get_all('User', filters={'user_type': 'System User', 'enabled': 1},
@@ -35,7 +36,7 @@ def get_module_icons_html(user=None):
 		icons = get_user_icons(user)
 
 	return frappe.render_template('frappe/core/page/modules_setup/includes/module_icons.html',
-		{'icons': icons})
+		{'icons': icons, 'user': user})
 
 def get_user_icons(user):
 	'''Get user icons for module setup page'''
@@ -49,7 +50,7 @@ def get_user_icons(user):
 	icons = []
 	for icon in get_desktop_icons(user):
 		add = True
-		if icon.blocked:
+		if icon.hidden_in_standard:
 			add = False
 
 		if not icon.custom: