diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 69ece9c7..6d384346 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 Thanks for taking the time to contribute!
 
-Please, read https://github.com/antelle/keeweb/wiki/FAQ before submitting a new issue and fill in the following:
+Please, read https://github.com/antelle/keeweb/wiki/FAQ before submitting a new issue and fill in the following (if applicable):
 
 - what were your actions?
 - what was wrong?
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d854bed8..26662c7a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,12 +2,13 @@ Thanks for taking the time to contribute! :gift:
 
 Please follow these steps:
 
-1. make sure the feature you add is not listed in [banned features](https://github.com/antelle/keeweb/wiki/Unsupported-Features)
-2. check compatibility with [the project roadmap](https://github.com/antelle/keeweb/wiki/TODO) and key features: you should not break anything
-3. if your feature is introducing a lot of new UI, or is changing any UX or design concept, please, open an issue to discuss it first
-4. please, respect existing style in code, styles and markup (hint: install and enable [editorconfig](http://editorconfig.org/) in your editor)
-5. don't add any dependencies
-6. test your code: it must work in browser, Windows, OSX and Linux
-7. if your code is platform-dependent, please add corresponding switches
-8. respect each platform: don't create behaviour which breaks interface guidelines or user expectations 
-9. run `grunt` and make sure it's passing 
+1. work on the right branch: it must be `develop` for new features and `master` for hotfixes
+2. make sure the feature you add is not listed in [banned features](https://github.com/antelle/keeweb/wiki/Unsupported-Features)
+3. check compatibility with [the project roadmap](https://github.com/antelle/keeweb/wiki/TODO) and key features: you should not break anything
+4. if your feature is introducing a lot of new UI, or is changing any UX or design concept, please, open an issue to discuss it first
+5. please, respect existing style in code, styles and markup (hint: install and enable [editorconfig](http://editorconfig.org/) in your editor)
+6. don't add any dependencies
+7. test your code: it must work in browser, Windows, OSX and Linux
+8. if your code is platform-dependent, please add corresponding switches
+9. respect each platform: don't create behaviour which breaks interface guidelines or user expectations 
+10. run `grunt` and make sure it's passing