diff --git a/media/css/seahub.css b/media/css/seahub.css
index d809e2bf0c..5dd0eab231 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -889,6 +889,12 @@ textarea:-moz-placeholder {/* for FF */
     margin-top:20px;
     color:#666;
 }
+.new-narrow-panel-tip {
+    margin-top: 20px;
+    text-align: center;
+    color:#666;
+    font-size: 13px;
+}
 /**** wide panel ****/ /* e.g. repo decrypt page */
 .wide-panel {
     width: 928px;
diff --git a/seahub/templates/registration/password_change_done.html b/seahub/templates/registration/password_change_done.html
index c2e9e918db..b174ce82a3 100644
--- a/seahub/templates/registration/password_change_done.html
+++ b/seahub/templates/registration/password_change_done.html
@@ -7,6 +7,7 @@
 
 <div class="text-panel">
     <p>{% trans "Your password has been changed successfully." %}</p>
+    <p><a class="btn-link big-btn-link" href="{{ SITE_ROOT }}accounts/login/">{% trans "Log in again" %}</a></p>
 </div>
 
 {% endblock %}
diff --git a/seahub/templates/registration/password_change_form.html b/seahub/templates/registration/password_change_form.html
index b17e32e4d8..3f093592fa 100644
--- a/seahub/templates/registration/password_change_form.html
+++ b/seahub/templates/registration/password_change_form.html
@@ -7,12 +7,12 @@
 {% endblock %}
 
 {% block main_panel %}
-{% if force_passwd_change %}
-<p class="alc">{% trans "Please update your password before continue." %} </p>
-{% endif %}
 
 <div class="new-narrow-panel">
   <h2 class="hd">{% trans "Password Modification" %}</h2>
+  {% if force_passwd_change %}
+  <p class="new-narrow-panel-tip"><span class="icon-lightbulb" aria-hidden="true"></span> {% trans "Please update your password before continue." %} </p>
+  {% endif %}
   <form action="" method="post" class="con">{% csrf_token %}
     <label for="id_old_password">{% trans "Current Password" %}</label>
     {{ form.old_password }}     {{ form.old_password.errors }}