diff --git a/frontend/src/components/share-link-panel/link-creation.js b/frontend/src/components/share-link-panel/link-creation.js
index e19cbf78c3..2973e288c1 100644
--- a/frontend/src/components/share-link-panel/link-creation.js
+++ b/frontend/src/components/share-link-panel/link-creation.js
@@ -135,7 +135,7 @@ class LinkCreation extends React.Component {
         let resp_data = error.response.data;
         let errMessage = resp_data && resp_data['error_msg'];
         if (errMessage === 'Folder permission denied.') {
-          this.setState({errorInfo: gettext('Share links cannot be generated because there are invisible or online r/rw folder permissions in the library.')});
+          this.setState({errorInfo: gettext('Share links cannot be generated because "Invisible", "Online Read-Write" or "Online Read-Only" is set for you on some folder(s) in the library.')});
         } else {
           let errMessage = Utils.getErrorMsg(error);
           toaster.danger(errMessage);
diff --git a/seahub/auth/forms.py b/seahub/auth/forms.py
index fff1c1a17f..889896fafe 100644
--- a/seahub/auth/forms.py
+++ b/seahub/auth/forms.py
@@ -96,7 +96,7 @@ class AuthenticationForm(forms.Form):
                     )
                     if adfs_user.exists():
                         self.errors['disable_pwd_login'] = _('You cannot login with email and password.')
-                        raise forms.ValidationError(_('You cannot login with email and password. '))
+                        raise forms.ValidationError(_('You cannot login with email and password.'))
 
         # TODO: determine whether this should move to its own method.
         if self.request:
diff --git a/seahub/templates/registration/login.html b/seahub/templates/registration/login.html
index 2413ed072d..e3221ab999 100644
--- a/seahub/templates/registration/login.html
+++ b/seahub/templates/registration/login.html
@@ -59,7 +59,7 @@ html, body, #wrapper { height:100%; }
         {% elif form.errors.not_found %}
         <p class="error mt-2">{{ form.errors.not_found }}</p>
         {% elif form.errors.disable_pwd_login %}
-        <p class="error mt-2">{% trans "You cannot login with email and password. " %}</p>
+        <p class="error mt-2">{% trans "You cannot login with email and password." %}</p>
         {% else %}
         <p class="error mt-2">{% trans "Incorrect email or password" %}</p>
         {% endif %}