diff --git a/requirements.txt b/requirements.txt
index 18b193b88e..026e85b8fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ Django==2.2.14
 future
 captcha
 django-statici18n
-django-webpack_loader
+django-webpack_loader==0.7.0
 gunicorn
 mysqlclient
 django-picklefield==2.1.1
diff --git a/seahub/onlyoffice/utils.py b/seahub/onlyoffice/utils.py
index 552954862f..523ef6cfe1 100644
--- a/seahub/onlyoffice/utils.py
+++ b/seahub/onlyoffice/utils.py
@@ -107,7 +107,7 @@ def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='',
         'can_download': can_download,
         'username': username,
         'onlyoffice_force_save': ONLYOFFICE_FORCE_SAVE,
-        'enable_watermark': ENABLE_WATERMARK and not can_edit,
+        'enable_watermark': ENABLE_WATERMARK,
     }
 
     if ONLYOFFICE_JWT_SECRET:
diff --git a/seahub/templates/view_file_wopi.html b/seahub/templates/view_file_wopi.html
index af5f265643..b67c7fb923 100644
--- a/seahub/templates/view_file_wopi.html
+++ b/seahub/templates/view_file_wopi.html
@@ -45,7 +45,9 @@
     document.getElementById('office_form').submit();
     document.getElementById('office_frame').className = '';
 </script>
+{% if enable_watermark %}
 <script type="text/javascript" src="{{ MEDIA_URL }}js/watermark.js"></script>
 <script type="text/javascript">{% include "snippets/add_watermark.html" %}</script>
+{% endif %}
 </body>
 </html>
diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py
index f5ba1566f2..46be5789f8 100644
--- a/seahub/utils/__init__.py
+++ b/seahub/utils/__init__.py
@@ -1127,7 +1127,7 @@ if HAS_OFFICE_CONVERTER:
     def add_office_convert_task(file_id, doctype, raw_path):
         payload = {'exp': int(time.time()) + 300, }
         token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256')
-        headers = {"Authorization": "Token %s" % token.decode()}
+        headers = {"Authorization": "Token %s" % token}
         params = {'file_id': file_id, 'doctype': doctype, 'raw_path': raw_path}
         url = urljoin(OFFICE_CONVERTOR_ROOT, '/add-task')
         requests.get(url, params, headers=headers)
@@ -1136,7 +1136,7 @@ if HAS_OFFICE_CONVERTER:
     def query_office_convert_status(file_id, doctype):
         payload = {'exp': int(time.time()) + 300, }
         token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256')
-        headers = {"Authorization": "Token %s" % token.decode()}
+        headers = {"Authorization": "Token %s" % token}
         params = {'file_id': file_id, 'doctype': doctype}
         url = urljoin(OFFICE_CONVERTOR_ROOT, '/query-status')
         d = requests.get(url, params, headers=headers)
@@ -1164,7 +1164,7 @@ if HAS_OFFICE_CONVERTER:
         url = urljoin(OFFICE_CONVERTOR_ROOT, '/get-converted-page')
         payload = {'exp': int(time.time()) + 300, }
         token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256')
-        headers = {"Authorization": "Token %s" % token.decode()}
+        headers = {"Authorization": "Token %s" % token}
         params = {'static_filename': static_filename, 'file_id': file_id}
         try:
             ret = requests.get(url, params, headers=headers)