diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 1c3015523fa4c502e206166709c4d42bdfaf861e..628d0f90537adf9450134af38cd456a0fbe8374e 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -230,7 +230,9 @@ function editTreeNode() {
 	if (!current_node){
 	    return
     }
-    current_node.name = current_node.value;
+    if (current_node.value) {
+        current_node.name = current_node.value;
+    }
     zTree.editName(current_node);
 }
 
diff --git a/apps/users/models/group.py b/apps/users/models/group.py
index 07238c1a5b974418da4c6761ae6fc680b6c4ee75..128fbdbcb7cc1758c9fd9b1ff026b9ad1ad5d0ca 100644
--- a/apps/users/models/group.py
+++ b/apps/users/models/group.py
@@ -22,6 +22,7 @@ class UserGroup(NoDeleteModelMixin):
 
     class Meta:
         ordering = ['name']
+        verbose_name = _("User group")
 
     @classmethod
     def initial(cls):
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 25d7d0303083ff84757aacd423dbe61301ee778f..4c051db229063ef1f90e803127f82cf118211cdf 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -251,6 +251,7 @@ class User(AbstractUser):
 
     class Meta:
         ordering = ['username']
+        verbose_name = _("User")
 
     #: Use this method initial user
     @classmethod
diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html
index 76eaad511731b8c2dcfe5f89d193aba7d6e91ce5..13276f6fe5a68aec35176e54050f1a816a37b684 100644
--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -22,24 +22,27 @@
     <div class="loginColumns animated fadeInDown">
         <div class="row">
             <div class="col-md-6">
-                <h2 class="font-bold">欢迎使用Jumpserver开源跳板机</h2>
+                <h2 class="font-bold">欢迎使用Jumpserver开源堡垒机</h2>
                 <p>
-                    符合4A规范的专业运维审计系统：拥有跳板机的所有功能，认证，授权，审计，文件上传；
+                    全球首款完全开源的堡垒机，使用GNU GPL v2.0开源协议，是符合 4A 的专业运维审计系统。
                 </p>
                 <p>
-                    极致的用户使用体验：拥有时尚外观是区别与以往版本和其他软件的铭牌，高雅的气质让你爱不释手；
+                    使用Python / Django 进行开发，遵循 Web 2.0 规范，配备了业界领先的 Web Terminal 解决方案，交互界面美观、用户体验好。
                 </p>
                 <p>
-                    混合云环境下的堡垒机：怎么能容忍传统堡垒机的繁琐步骤，Jumpserver让你极致省力;
+                    采纳分布式架构，支持多机房跨区域部署，中心节点提供 API，各机房部署登录节点，可横向扩展、无并发访问限制。
                 </p>
                 <p>
-                    <small>改变世界，从一点点开始。</small>
+                    改变世界，从一点点开始。
                 </p>
 
             </div>
             <div class="col-md-6">
                 <div class="ibox-content">
-                    <div><img src="{% static 'img/logo.png' %}" width="82" height="82"> <span class="font-bold text-center" style="font-size: 32px; font-family: inherit">{% trans 'Login' %}</span></div>
+                    <div>
+                        <img src="{% static 'img/logo.png' %}" width="60" height="60">
+                        <span class="font-bold text-center" style="font-size: 24px; font-family: inherit; margin-left: 20px">{% trans 'Login' %}</span>
+                    </div>
                     <form class="m-t" role="form" method="post" action="">
                         {% csrf_token %}
                         {% if form.errors %}