diff --git a/frontend/src/components/code-mirror-loading/style.css b/frontend/src/components/code-mirror-loading/style.css
index b806b9718f..fa56ed3825 100644
--- a/frontend/src/components/code-mirror-loading/style.css
+++ b/frontend/src/components/code-mirror-loading/style.css
@@ -21,7 +21,7 @@
 
 .lds-ripple div {
   position: absolute;
-  border: 4px solid #eb8205;
+  border: 4px solid #EC8000;
   opacity: 1;
   border-radius: 50%;
   animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
diff --git a/frontend/src/components/seafile-markdown-viewer/style.css b/frontend/src/components/seafile-markdown-viewer/style.css
index 6c04a2f684..3efc9b9ee3 100644
--- a/frontend/src/components/seafile-markdown-viewer/style.css
+++ b/frontend/src/components/seafile-markdown-viewer/style.css
@@ -15,7 +15,7 @@
 
 .wiki-page-container .article .ml-2:hover {
   text-decoration: underline;
-  color: #eb8205;
+  color: #EC8000;
 }
 
 #wiki-page-last-modified {
diff --git a/frontend/src/css/file-chooser.css b/frontend/src/css/file-chooser.css
index f26677a3c6..ad920eeced 100644
--- a/frontend/src/css/file-chooser.css
+++ b/frontend/src/css/file-chooser.css
@@ -159,5 +159,5 @@
 }
 
 .file-chooser-list-view-header .name {
-  color: #eb8205;
+  color: #EC8000;
 }
diff --git a/frontend/src/css/file-history-old.css b/frontend/src/css/file-history-old.css
index d6404461ce..268d251bdf 100644
--- a/frontend/src/css/file-history-old.css
+++ b/frontend/src/css/file-history-old.css
@@ -78,7 +78,7 @@
 
 .old-history-main .commit-list .username {
   vertical-align: middle;
-  color: #eb8205;
+  color: #EC8000;
   text-decoration: none;
   font-weight: bold;
 }
diff --git a/frontend/src/css/file-view.css b/frontend/src/css/file-view.css
index 13eb0e0b5f..1f589e7295 100644
--- a/frontend/src/css/file-view.css
+++ b/frontend/src/css/file-view.css
@@ -71,7 +71,7 @@ body {
 }
 
 .file-view-header .file-toolbar-btn#save-file {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .file-view-header .file-toolbar-more-operations {
diff --git a/frontend/src/css/org-department-item.css b/frontend/src/css/org-department-item.css
index b0c4a812c9..b7d0d7652f 100644
--- a/frontend/src/css/org-department-item.css
+++ b/frontend/src/css/org-department-item.css
@@ -5,7 +5,7 @@
 }
 
 .cur-view-path .sf-heading a {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .cur-view-subcontainer {
diff --git a/frontend/src/css/side-panel.css b/frontend/src/css/side-panel.css
index 36fe04395f..f2ff4eb2b7 100644
--- a/frontend/src/css/side-panel.css
+++ b/frontend/src/css/side-panel.css
@@ -21,7 +21,7 @@
 }
 
 .side-panel .nav-link.active {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .side-panel-content {
@@ -57,7 +57,7 @@
   text-align: center;
   line-height: 150px;
   font-size: 30px;
-  color: #eb8205;
+  color: #EC8000;
   -moz-animation: rotate 1.5s ease infinite;
   -webkit-animation: rotate 1.5s ease infinite;
   animation: rotate 1.5s ease infinite;
@@ -82,7 +82,7 @@
 }
 
 .outline-h2:hover {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .outline-h3 {
@@ -94,7 +94,7 @@
 }
 
 .outline-h3:hover {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 /*tree view */
diff --git a/frontend/src/css/tip-for-new-file.css b/frontend/src/css/tip-for-new-file.css
index 156f448813..790af09c53 100644
--- a/frontend/src/css/tip-for-new-file.css
+++ b/frontend/src/css/tip-for-new-file.css
@@ -30,5 +30,5 @@
 .big-new-file-button:hover,
 .big-new-file-button:focus {
   border-color: #eb9205;
-  color: #eb8205;
+  color: #EC8000;
 }
diff --git a/frontend/src/css/toolbar.css b/frontend/src/css/toolbar.css
index 8e76d7c091..a6906961a0 100644
--- a/frontend/src/css/toolbar.css
+++ b/frontend/src/css/toolbar.css
@@ -79,7 +79,7 @@
 
 
 .path-toolbar .toolbar-item a:hover {
-  color: #eb8205;
+  color: #EC8000;
   text-decoration:none;
 }
 /* end path toolbar */
diff --git a/frontend/src/index.css b/frontend/src/index.css
index acc9c8ca11..ada6ba76ce 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -51,7 +51,7 @@ input[type="checkbox"] {
 
 a,
 a:hover {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .lds-ripple {
@@ -60,16 +60,19 @@ a:hover {
   width: 64px;
   height: 64px;
 }
+
 .lds-ripple div {
   position: absolute;
-  border: 4px solid #eb8205;
+  border: 4px solid #EC8000;
   opacity: 1;
   border-radius: 50%;
   animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
 }
+
 .lds-ripple div:nth-child(2) {
   animation-delay: -0.5s;
 }
+
 @keyframes lds-ripple {
   0% {
     top: 28px;
@@ -86,6 +89,7 @@ a:hover {
     opacity: 0;
   }
 }
+
 .empty-loading-page {
   position: fixed;
   height: 100%;
diff --git a/frontend/src/pages/markdown-editor/css/header-toolbar.css b/frontend/src/pages/markdown-editor/css/header-toolbar.css
index 7b6aae9244..6ba1ca4dae 100644
--- a/frontend/src/pages/markdown-editor/css/header-toolbar.css
+++ b/frontend/src/pages/markdown-editor/css/header-toolbar.css
@@ -40,7 +40,7 @@
 }
 
 .btn-active[data-active=true]#saveButton {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .sf-md-viewer-topbar .btn:focus,
diff --git a/frontend/src/pages/wiki/index-md-viewer/style.css b/frontend/src/pages/wiki/index-md-viewer/style.css
index cc49daacc4..47388fb94d 100644
--- a/frontend/src/pages/wiki/index-md-viewer/style.css
+++ b/frontend/src/pages/wiki/index-md-viewer/style.css
@@ -18,12 +18,12 @@
 
 .wiki-nav-content a:hover {
   text-decoration: none;
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .wiki-nav-content-highlight a {
   text-decoration: none;
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .switch-btn {
diff --git a/frontend/src/pages/wiki/wiki.css b/frontend/src/pages/wiki/wiki.css
index 9a3b788292..7f190c0aea 100644
--- a/frontend/src/pages/wiki/wiki.css
+++ b/frontend/src/pages/wiki/wiki.css
@@ -115,7 +115,7 @@ img[src=""] {
 
 .wiki-page-container .outline-h2.active,
 .wiki-page-container .outline-h3.active { 
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .wiki-page-container .sf-slate-viewer-scroll-container {
diff --git a/media/bootstrap/bootstrap.popover.min.css b/media/bootstrap/bootstrap.popover.min.css
index 75f981a652..bf4068f61b 100644
--- a/media/bootstrap/bootstrap.popover.min.css
+++ b/media/bootstrap/bootstrap.popover.min.css
@@ -12,7 +12,7 @@
 }
 
 a {
-  color: #eb8205;
+  color: #EC8000;
   text-decoration: none;
   font-weight: bold;
 }
diff --git a/media/css/seahub.css b/media/css/seahub.css
index d2c65129a9..2b7ecf3c48 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -410,7 +410,7 @@ dd {
 }
 
 a {
-  color: #eb8205;
+  color: #EC8000;
   text-decoration: none;
   font-weight: bold;
 }
@@ -421,7 +421,7 @@ a.normal {
 
 a:focus,
 a:hover {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 img {
@@ -985,7 +985,7 @@ textarea:-moz-placeholder {
 
 /**** btn with link styles ****/
 .sf-link-btn {
-  color: #eb8205;
+  color: #EC8000;
   border: none;
   padding: 0;
   background: none;
@@ -993,7 +993,7 @@ textarea:-moz-placeholder {
 
 .sf-link-btn:focus,
 .sf-link-btn:hover {
-  color: #eb8205;
+  color: #EC8000;
   background: none;
   text-decoration: underline;
 }
@@ -1562,9 +1562,9 @@ textarea:-moz-placeholder {
 
 .cur-view-path .tab-tabs-nav .ui-state-active .a,
 .cur-view-path .tab-tabs-nav .a:hover {
-  color: #eb8205;
+  color: #EC8000;
   text-decoration: none;
-  border-bottom-color: #eb8205;
+  border-bottom-color: #EC8000;
 }
 
 .tab-tabs .ui-tabs-panel {
@@ -1883,9 +1883,9 @@ a.sf-popover-item {
 .wiki-nav .link:hover,
 #right-panel .hd .ui-state-active .a,
 #right-panel .hd .a:hover {
-  color: #eb8205;
+  color: #EC8000;
   text-decoration: none;
-  border-bottom-color: #eb8205;
+  border-bottom-color: #EC8000;
 }
 
 .tabnav button,
@@ -2087,7 +2087,7 @@ a.sf-popover-item {
 }
 
 #log-in-panel {
-  padding: 30px 25px 15px;
+  padding: 30px 25px 12px;
   width: 336px;
 }
 
@@ -2188,7 +2188,7 @@ a.sf-popover-item {
 }
 
 #login-bottom .bottom-item {
-  border-right: 1px solid #eb8205;
+  border-right: 1px solid #EC8000;
 }
 
 #signup-form .input {
@@ -2199,20 +2199,23 @@ a.sf-popover-item {
   border: 0;
   height: 1px;
   background-color: #DBDBDB;
-  margin-top: 20px;
-  margin-bottom: 15px;
+  margin: 20px -25px 0px -25px;
+  opacity: 1;
 }
+
 .login-panel-bottom-privacy-policy {
   font-size: 12px;
   line-height: 1;
   margin-top: 12px;
 }
+
 .login-panel-bottom-privacy-policy a {
   color: #EC8000;
   font-size: 12px;
 }
+
 .login-panel-bottom-privacy-policy .bottom-item {
-  border-right: 1px solid #eb8205;
+  border-right: 1px solid #EC8000;
 }
 
 /*myhome*/
diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css
index e7eb71b4f2..a8b511e9a5 100644
--- a/media/css/seahub_react.css
+++ b/media/css/seahub_react.css
@@ -772,9 +772,9 @@ a, a:hover {
 }
 
 .nav .nav-item .nav-link.active {
-  color: #eb8205;
+  color: #EC8000;
   text-decoration: none;
-  border-bottom-color: #eb8205;
+  border-bottom-color: #EC8000;
   z-index: 1;
 }
 
@@ -1151,7 +1151,7 @@ a.sf-popover-item:hover {
 }
 
 .path-link {
-  color: #eb8205 !important;
+  color: #EC8000 !important;
   text-decoration: none;
 }
 
@@ -1253,7 +1253,7 @@ table td {
   padding: 0.25rem 0.75rem;
   line-height: 2rem;
   text-align: center;
-  color: #eb8205;
+  color: #EC8000;
   cursor: pointer;
 }
 
@@ -1567,7 +1567,7 @@ a.table-sort-op:hover {
 
 .seafile-md-viewer-outline-heading2:hover,
 .seafile-md-viewer-outline-heading3:hover {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 .seafile-markdown-outline {
@@ -1585,8 +1585,8 @@ a.table-sort-op:hover {
 }
 
 .seafile-markdown-outline .active {
-  color: #eb8205;
-  border-left: 1px solid #eb8205;
+  color: #EC8000;
+  border-left: 1px solid #EC8000;
 }
 
 .seafile-markdown-outline .outline-h2,
@@ -1616,7 +1616,7 @@ a.table-sort-op:hover {
 
 #wiki-file-content .seafile-markdown-outline .outline-h2.active,
 #wiki-file-content .seafile-markdown-outline .outline-h3.active {
-  color: #eb8205;
+  color: #EC8000;
 }
 
 #wiki-file-content .seafile-markdown-outline .seafile-markdown-outline {
diff --git a/seahub/templates/registration/login.html b/seahub/templates/registration/login.html
index 01c4b72bf8..61ddc1dc6d 100644
--- a/seahub/templates/registration/login.html
+++ b/seahub/templates/registration/login.html
@@ -122,7 +122,11 @@ html, body, #wrapper { height:100%; }
     <hr class="login-panel-bottom-divider">
     <div class="login-panel-bottom-privacy-policy d-flex justify-content-center">
         {% if privacy_policy_link %}
-        <a href="{{ privacy_policy_link }}" class="normal px-2 bottom-item">{% trans "Privacy Policy" %}</a>
+        <a href="{{ privacy_policy_link }}" class="normal px-2">{% trans "Privacy Policy" %}</a>
+        {% endif %}
+
+        {% if privacy_policy_link and terms_of_service_link %}
+        <span class="bottom-item"></span>
         {% endif %}
 
         {% if terms_of_service_link %}