diff --git a/base/templatetags/seahub_tags.py b/base/templatetags/seahub_tags.py
index e5df0dca16..644d4b88d1 100644
--- a/base/templatetags/seahub_tags.py
+++ b/base/templatetags/seahub_tags.py
@@ -122,3 +122,13 @@ def email2nickname(value):
 def url_target_blank(text):
     return text.replace('<a ', '<a target="_blank" ')
 url_target_blank.is_safe=True
+
+@register.filter(name='short_email')
+def short_email(email):
+    """
+    Return short email which is the string before '@'.
+    """
+    if email.find('@') <= 0:
+        return email
+    else:
+        return email[:email.find('@')]
diff --git a/templates/repo.html b/templates/repo.html
index e8104ec95b..1c65de600f 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -27,7 +27,7 @@
         <p class="al-rt">
           <span class="author">by
           {% if current_commit.props.creator_name %}
-          {{ current_commit.props.creator_name }}
+          {{ current_commit.props.creator_name|short_email }}
           {% else %}
           未知
           {% endif %}
diff --git a/templates/repo_history.html b/templates/repo_history.html
index 67295a56a2..c6026f7349 100644
--- a/templates/repo_history.html
+++ b/templates/repo_history.html
@@ -23,7 +23,7 @@
         <td>{{ commit.props.ctime|translate_commit_time }}</td>
 
         {% if commit.props.creator_name %}
-        <td>{{ commit.props.creator_name }}</td>
+        <td>{{ commit.props.creator_name|short_email }}</td>
         {% else %}
         <td>未知</td>
         {% endif %}