diff --git a/client/views/account/avatar/prompt.html b/client/views/account/avatar/prompt.html
index f43f9c8fd1f7ec8498f3808618f16f48b8aa2cc7..b38fdae34680b5705b55e05160f709ea1a9b3aec 100644
--- a/client/views/account/avatar/prompt.html
+++ b/client/views/account/avatar/prompt.html
@@ -58,6 +58,7 @@
{{/unless}}
</div>
</div>
+
{{#if suggestions.ready}}
{{> avatarSuggestion suggestions.avatars.gravatar}}
{{> avatarSuggestion suggestions.avatars.facebook}}
@@ -86,6 +87,7 @@
{{> avatarSuggestionLogin 'twitter'}}
{{/if}}
+
{{else}}
{{_ "Loading_suggestion"}}
{{/if}}
diff --git a/client/views/app/sideNav/userStatus.html b/client/views/app/sideNav/userStatus.html
index 1e5261484da0edfea977d109ff2d7a6a16550c91..5bac582d2c1f4e0d1cad02c98fa7568a4c48a834 100644
--- a/client/views/app/sideNav/userStatus.html
+++ b/client/views/app/sideNav/userStatus.html
@@ -18,13 +18,10 @@
<a href="" data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></a>
<a href="" data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></a>
<a href="" id="account" class='account-link'><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></a>
- <!-- disable admin and logout for sandstorm
{{#if showAdminOption }}
<a href="" id="admin" class='account-link'><i class="icon-wrench"></i><span>{{_ "Administration"}}</span></a>
{{/if}}
-
<a href="" id="logout"><i class="icon-logout"></i><span>{{_ "Logout"}}</span></a>
- -->
</div>
</nav>
{{/with}}
diff --git a/client/views/username/sandstormshare.html b/client/views/username/sandstormshare.html
deleted file mode 100644
index 090a89d8a4582b6cf4583869b762cc04dbb87cab..0000000000000000000000000000000000000000
--- a/client/views/username/sandstormshare.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="sandstormshare">
- <section class="full-page">
- <div class="wrapper">
-
- </div>
- </section>
-</template>