diff --git a/src/templates/profile_view.html b/src/templates/profile_view.html
index c76405202..24f522847 100644
--- a/src/templates/profile_view.html
+++ b/src/templates/profile_view.html
@@ -1,9 +1,12 @@
 <div class="userinfo">
 <div class="d-flex">
+    {[ if (o.image) { ]}
     <img alt="User Avatar" class="avatar align-self-center" height="40px" width="40px" src="data:{{{o.image_type}}};base64,{{{o.image}}}"/>
+    {[ } ]}
     <span class="username w-100 align-self-center">{{{o.fullname}}}</span>
     <!-- <a class="chatbox-btn fa fa-vcard align-self-center" title="{{{o.title_your_profile}}}" data-toggle="modal" data-target="#userProfileModal"></a> -->
-    <a class="chatbox-btn fa fa-cog align-self-center" title="{{{o.title_change_status}}}" data-toggle="modal" data-target="#settingsModal"></a>
+    <!-- <a class="chatbox-btn fa fa-cog align-self-center" title="{{{o.title_change_status}}}" data-toggle="modal" data-target="#settingsModal"></a> -->
+    <a class="chatbox-btn fa fa-sign-out align-self-center" title="{{{o.title_log_out}}}"></a>
 </div>
 <div class="d-flex xmpp-status">
     <span class="{{{o.chat_status}}} w-100 align-self-center" data-value="{{{o.chat_status}}}">