diff --git a/app/assets/javascripts/app/views/popover/organization.jst.eco b/app/assets/javascripts/app/views/popover/organization.jst.eco
index 49a143fbf..6301dc391 100644
--- a/app/assets/javascripts/app/views/popover/organization.jst.eco
+++ b/app/assets/javascripts/app/views/popover/organization.jst.eco
@@ -1,10 +1,14 @@
 <hr>
-<div class="horizontal two-columns">
+<div>
 <% for row in @organizationData: %>
   <% if @organization[row.name]: %>
     <div class="column">
       <h3><%- @T( row.display ) %></h3>
-      <div><%- @L( @P( @organization[row.name] ) ) %></div>
+      <% if row.tag is 'richtext': %>
+        <div><%- @organization[row.name] %></div>
+      <% else: %>
+        <div><%- @L( @P( @organization[row.name] ) ) %></div>
+      <% end %>
     </div>
   <% end %>
 <% end %>
diff --git a/app/assets/javascripts/app/views/popover/user.jst.eco b/app/assets/javascripts/app/views/popover/user.jst.eco
index 5d08ad6d3..48ba7d8b6 100644
--- a/app/assets/javascripts/app/views/popover/user.jst.eco
+++ b/app/assets/javascripts/app/views/popover/user.jst.eco
@@ -2,18 +2,22 @@
 <div class="user-organization"><a href="<%- @user.organization.uiUrl() %>"><%= @user.organization.displayName() %></a></div>
 <% end %>
 <hr>
-<div class="horizontal two-columns">
+<div>
 <% for row in @userData: %>
   <% if @user[row.name]: %>
   <div class="column">
     <h3><%- @T( row.display ) %></h3>
-    <div><%- @L( @P( @user[row.name] ) ) %></div>
+    <% if row.tag is 'richtext': %>
+      <div><%- @user[row.name] %></div>
+    <% else: %>
+      <div><%- @L( @P( @user[row.name] ) ) %></div>
+    <% end %>
   </div>
   <% end %>
 <% end %>
 <% if !_.isEmpty(@user['accounts']): %>
     <div class="customer-info">
-      <strong><%- @T( 'Linked Accounts' ) %></strong><br/>
+      <h3><%- @T( 'Linked Accounts' ) %></h3>
       <% for account of @user['accounts']: %>
         <a href="<%= @user['accounts'][account]['link'] %>" target="_blank"><%= account %></a>
       <% end %>
@@ -22,7 +26,7 @@
 <% if !_.isEmpty( @user['links'] ): %>
   <% for link in @user['links']: %>
     <div class="customer-info">
-      <strong><%- @T( link['title'] ) %></strong><br/>
+      <h3><%- @T( link['title'] ) %></h3>
       <% for item in link['items']: %>
         <% if item['url']: %>
           <a href="<%= item['url'] %>" title="<%- @Ti( item['title'] ) %>" style="<%= item['style'] %>" data-type="<%= item['data'] %>" class="<%= item['class'] %>" <% if link.new_window: %>target="_blank"<% end %>>