diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 8643d82c..6b30a194 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -571,6 +571,16 @@ class User(Base, BaseModel):
     def email(self, val):
         self._email = val.lower() if val else None
 
+    @hybrid_property
+    def first_name(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.name)
+
+    @hybrid_property
+    def last_name(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.lastname)
+
     @hybrid_property
     def api_key(self):
         """