diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index ecbb0b694..a60f147ba 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -6,25 +6,24 @@
     <% else %>
 
       <%= avatar_image(comment.user, size: 32, class: 'left') %>
-      <!-- if user deleted -->
+      <!-- if comment.user.hidden?
         <i class="icon-deleted user-deleted"></i>
-      <!-- end -->
+           end -->
 
       <div class="comment-body">
         <div class="comment-info">
 
-          <!-- if user deleted -->
+          <!--  if comment.user.hidden?
             <span class="user-name"><%= t("debates.comment.user_deleted") %></span>
-          <!-- else -->
+                else -->
             <span class="user-name"><%= comment.user.name %></span>
+            <% if comment.user.official? %>
+              &nbsp;&bullet;&nbsp;
+              <span class="label round level-<%= comment.user.official_level %>">
+                <%= comment.user.official_position %>
+              </span>
+            <% end %>
           <!-- end -->
-          &nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
-          <% if comment.user.official? %>
-            &nbsp;&bullet;&nbsp;
-            <span class="label round level-<%= comment.user.official_level %>">
-              <%= comment.user.official_position %>
-            </span>
-          <% end %>
           <% if comment.user.verified_organization? %>
             &nbsp;&bullet;&nbsp;
             <span class="label round is-association">
@@ -37,6 +36,7 @@
               <%= t("debates.comment.author") %>
             </span>
           <% end %>
+          &nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
         </div>
 
         <% if comment.user.official? %>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index db8cbdc14..964e7d43d 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -14,22 +14,22 @@
 
       <div class="debate-info">
         <%= avatar_image(@debate.author, size: 32, class: 'author-photo') %>
-        <!-- if user deleted -->
-        <i class="icon-deleted author-deleted"></i>
-        <span class="author">
-            <%= t("debates.show.author_deleted") %>
-        </span>
-        <!-- else -->
-        <span class="author">
-            <%= @debate.author.name %>
-        </span>
-        <!-- end -->
-        <% if @debate.author.official? %>
-          &nbsp;&bullet;&nbsp;
-          <span class="label round level-<%= @debate.author.official_level %>">
-            <%= @debate.author.official_position %>
+        <!-- if @debate.author.hidden? %>
+          <i class="icon-deleted author-deleted"></i>
+          <span class="author">
+              <%= t("debates.show.author_deleted") %>
           </span>
-        <% end %>
+            else -->
+          <span class="author">
+              <%= @debate.author.name %>
+          </span>
+          <% if @debate.author.official? %>
+            &nbsp;&bullet;&nbsp;
+            <span class="label round level-<%= @debate.author.official_level %>">
+              <%= @debate.author.official_position %>
+            </span>
+          <% end %>
+        <!-- end -->
         <% if @debate.author.verified_organization? %>
           &nbsp;&bullet;&nbsp;
           <span class="label round is-association">