diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -128,6 +128,11 @@ def _hash_key(k):
     return sha1_safe(k)
 
 
+def description_escaper(desc):
+    from rhodecode.lib import helpers as h
+    return h.html_escape(desc)
+
+
 def in_filter_generator(qry, items, limit=500):
     """
     Splits IN() into multiple with OR
@@ -663,16 +668,14 @@ class User(Base, BaseModel):
 
     @hybrid_property
     def first_name(self):
-        from rhodecode.lib import helpers as h
         if self.name:
-            return h.escape(self.name)
+            return description_escaper(self.name)
         return self.name
 
     @hybrid_property
     def last_name(self):
-        from rhodecode.lib import helpers as h
         if self.lastname:
-            return h.escape(self.lastname)
+            return description_escaper(self.lastname)
         return self.lastname
 
     @hybrid_property
@@ -1368,8 +1371,7 @@ class UserApiKeys(Base, BaseModel):
 
     @hybrid_property
     def description_safe(self):
-        from rhodecode.lib import helpers as h
-        return h.escape(self.description)
+        return description_escaper(self.description)
 
     @property
     def expired(self):
@@ -1472,8 +1474,7 @@ class UserIpMap(Base, BaseModel):
 
     @hybrid_property
     def description_safe(self):
-        from rhodecode.lib import helpers as h
-        return h.escape(self.description)
+        return description_escaper(self.description)
 
     @classmethod
     def _get_ip_range(cls, ip_addr):
@@ -1611,8 +1612,7 @@ class UserGroup(Base, BaseModel):
 
     @hybrid_property
     def description_safe(self):
-        from rhodecode.lib import helpers as h
-        return h.escape(self.user_group_description)
+        return description_escaper(self.user_group_description)
 
     @hybrid_property
     def group_data(self):
@@ -1956,8 +1956,7 @@ class Repository(Base, BaseModel):
 
     @hybrid_property
     def description_safe(self):
-        from rhodecode.lib import helpers as h
-        return h.escape(self.description)
+        return description_escaper(self.description)
 
     @hybrid_property
     def landing_rev(self):
@@ -2915,8 +2914,7 @@ class RepoGroup(Base, BaseModel):
 
     @hybrid_property
     def description_safe(self):
-        from rhodecode.lib import helpers as h
-        return h.escape(self.group_description)
+        return description_escaper(self.group_description)
 
     @classmethod
     def hash_repo_group_name(cls, repo_group_name):
@@ -4418,8 +4416,7 @@ class _PullRequestBase(BaseModel):
 
     @hybrid_property
     def description_safe(self):
-        from rhodecode.lib import helpers as h
-        return h.escape(self.description)
+        return description_escaper(self.description)
 
     @hybrid_property
     def revisions(self):
@@ -5027,8 +5024,7 @@ class Gist(Base, BaseModel):
 
     @hybrid_property
     def description_safe(self):
-        from rhodecode.lib import helpers as h
-        return h.escape(self.gist_description)
+        return description_escaper(self.gist_description)
 
     @classmethod
     def get_or_404(cls, id_):