diff --git a/app/assets/javascripts/app/views/popover/organization.jst.eco b/app/assets/javascripts/app/views/popover/organization.jst.eco
index 98fc357ed..fcf74c795 100644
--- a/app/assets/javascripts/app/views/popover/organization.jst.eco
+++ b/app/assets/javascripts/app/views/popover/organization.jst.eco
@@ -1,18 +1,20 @@
+
+
<% for row in @organizationData: %>
<% if @organization[row.name]: %>
- <% if row.tag is 'richtext': %>
-
<%- @organization[row.name] %>
- <% else: %>
-
<%- @L( @P( @organization[row.name] ) ) %>
- <% end %>
+
+
<%- @T( row.display ) %>
+
<%- @L( @P( @organization[row.name] ) ) %>
+
<% end %>
<% end %>
+
<% if @organization.members: %>
- <%- @T('Members') %>
-
- <% for user in @organization.members: %>
- - <%= user.displayName() %>
- <% end %>
-
+ <%- @T('Members') %>
+ <% for user in @organization.members: %>
+
+ <%= user.displayName() %>
+
+ <% end %>
<% end %>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/popover/user.jst.eco b/app/assets/javascripts/app/views/popover/user.jst.eco
index 99e8336dd..8fc3f9294 100644
--- a/app/assets/javascripts/app/views/popover/user.jst.eco
+++ b/app/assets/javascripts/app/views/popover/user.jst.eco
@@ -1,15 +1,14 @@
<% if @user['organization']: %>
-
- <%- @P( @user['organization'] ) %>
-
+
<% end %>
+
+
<% for row in @userData: %>
<% if @user[row.name]: %>
- <% if row.tag is 'richtext': %>
-
<%- @user[row.name] %>
- <% else: %>
-
<%- @L( @P( @user[row.name] ) ) %>
- <% end %>
+
+
<%- @T( row.display ) %>
+
<%- @L( @P( @user[row.name] ) ) %>
+
<% end %>
<% end %>
<% if !_.isEmpty(@user['accounts']): %>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 0548f498c..001a19583 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -2637,6 +2637,11 @@ footer {
color: #a1a4a7;
}
+ .popover .user-organization {
+ margin-bottom: 8px;
+ margin-top: -4px;
+ }
+
.popover hr {
margin: 8px 0;
}