diff --git a/.github/ISSUE_TEMPLATE/add-or-update-provider.md b/.github/ISSUE_TEMPLATE/add-or-update-provider.md
index 062c91bf0..29b6a708f 100644
--- a/.github/ISSUE_TEMPLATE/add-or-update-provider.md
+++ b/.github/ISSUE_TEMPLATE/add-or-update-provider.md
@@ -6,7 +6,6 @@ labels: 'Add/update provider'
 assignees: ''
 
 ---
-<!-- We are planning to move towards NOT including providers in this container, so please use CUSTOM until the new solution is working (see beta branch) -->
 
 **Which provider?**
 <!-- Name the provider you want updated -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c6512e26f..cfa4acefa 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,21 +8,23 @@ assignees: ''
 ---
 
 <!-- 
-PLEASE READ BELOW AND FILL IN THE TEMPLATE!
-DO NOT DELETE ANY PART OF THE TEMPLATE!
-In the future, any issues NOT using the template will be closed.
-Thanks for filing an issue! Before hitting the button, please answer these questions. It's helpful to search the existing GitHub issues first. It's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of.
+NB: PLEASE READ
+
+We expect you to look through the links provided in the checklist below
+and investigate your issue before you submit a new one.
+
+If you do not follow the template and show that you have done this, your issue will be closed.
 -->
 **Before creating this issue I have:**
-<!-- Put an X (capital X,no space) in the boxes to tick them, like this [X] (please use preview post to make sure they are marked correctly) -->
+<!-- Put an X (capital X,no space) in the boxes to tick them, like this [X] -->
 - [] Searched for [similar issues](https://github.com/haugene/docker-transmission-openvpn/issues)
-- [] [Read the documentation](https://haugene.github.io/docker-transmission-openvpn/). Especially the troubleshooting section
+- [] [Read the documentation](https://haugene.github.io/docker-transmission-openvpn/). Especially the troubleshooting section and FAQ
 - [] Tried to add as much relevant information to the issue as possible
 
 
 **Describe the problem**
 <!-- A clear and concise description of what the bug is. -->
-<!-- Check your logs, if it says things like (cannot resolve..) it is DNS related most likely, there are solutions, search -->
+<!-- Check your logs and compare it with the FAQ section of the documentation -->
 
 **Add your docker run command or docker-compose file**
 <!-- To understand how your container is running, provide the docker run command or the docker-compose.yml file you used to start it. If you're using a GUI to set up the container then provide screenshots or a list of options and settings. -->
diff --git a/docs/faq.md b/docs/faq.md
index 931d6c9ee..8083e2a34 100755
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -155,7 +155,7 @@ up your credentials. We have had challenges with special characters. Having "?=
 
 **NOTE** Some providers have multiple sets of credentials. Some for OpenVPN, others for web login, proxy solutions, etc.
 Make sure that you use the ones intended for OpenVPN. **PIA users:** this has recently changed. It used to be a separate pair, but now
-you should use the same login as you do in the web control panel. Before you were supposed to use a username like x12345, now its the p12345 one.
+you should use the same login as you do in the web control panel. Before you were supposed to use a username like x12345, now its the p12345 one. There is also a 99 character limit on password length.
 
 First check that your credentials are correct. Some providers have separate credentials for OpenVPN so it might not be the same as for their apps.
 Secondly, test a few different servers just to make sure that it's not just a faulty server. If this doesn't resolve it, it's probably the container.
diff --git a/openvpn/tunnelUp.sh b/openvpn/tunnelUp.sh
index e8aa1b5d3..5fd5f463b 100755
--- a/openvpn/tunnelUp.sh
+++ b/openvpn/tunnelUp.sh
@@ -42,4 +42,4 @@ fi
 /etc/transmission/start.sh "$@"
 [[ ! -f /opt/tinyproxy/start.sh ]] || /opt/tinyproxy/start.sh
 
-exit 0
\ No newline at end of file
+exit 0