diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5242324af..cd05f5b2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Changes to Calva.
 ## [Unreleased]
 - [Add cljfmt indent rules](https://github.com/BetterThanTomorrow/calva/issues/80)
 - Fix so that Calva treats symbol containing the quote character correctly.
+- [Fix: Parameter hints popup should be off by default](https://github.com/BetterThanTomorrow/calva/issues/574)
 
 ## [2.0.79] - 2020-03-01
 - Use scope `variable.other.constant` for keywords, making them highlight nicely
diff --git a/docs/readthedocs/source/customizing.md b/docs/readthedocs/source/customizing.md
index 8f816d986..d0d0a9921 100644
--- a/docs/readthedocs/source/customizing.md
+++ b/docs/readthedocs/source/customizing.md
@@ -12,6 +12,32 @@ Tip For VS Code newcomers: The search box in **Settings** is your friend. Also,
     },
 ```
 
+## Clojure Defaults
+
+Calva sets some VS Code settings for all Clojure files. Some of these are needed for Calva to function correctly, which should not be tampered with unless you really know what you are doing, and some of them are for convenience defaults. If you add a setting to your `settings.json` and accept the snippet help you get when you type `"[clojure]"`, you will get the Calva defaults pasted:
+
+```json
+    "[clojure]": {
+        "editor.wordSeparators": "\t ()\"':,;~@#$%^&{}[]`",
+        "editor.autoClosingBrackets": "always",
+        "editor.autoClosingQuotes": "always",
+        "editor.formatOnType": true,
+        "editor.autoIndent": "full",
+        "editor.formatOnPaste": true,
+        "files.trimTrailingWhitespace": false,
+        "editor.matchBrackets": "never",
+        "editor.parameterHints.enabled": false
+    }
+```
+
+### Automatic Parmaeter Hints Poppup
+
+Calva has helpful parameter hints to aid when typing function calls. They look like so:
+
+<img width="353" alt="image" src="https://user-images.githubusercontent.com/30010/75957543-8cf4c180-5eba-11ea-8d77-1e543a73ef28.png">
+
+To have the hints automatically pop up when you are typing, set `editor.parameterHints.enabled` to `true` in the above `[clojure]` scoped setting. (To call them up on demand the default VS Code keybindings are `cmd+shift+space` on Mac and `ctrl+shift+space` on Linux/Windows.)
+
 ## Jack-in and Connect Sequences
 
 Jack-in and Connect are very customizable through [Custom Connect Sequences](connect-sequences.md).
diff --git a/package.json b/package.json
index 7dbdbad66..dac3e8852 100644
--- a/package.json
+++ b/package.json
@@ -93,10 +93,11 @@
                 "editor.autoClosingBrackets": "always",
                 "editor.autoClosingQuotes": "always",
                 "editor.formatOnType": true,
-                "editor.autoIndent": true,
+                "editor.autoIndent": "full",
                 "editor.formatOnPaste": true,
                 "files.trimTrailingWhitespace": false,
-                "editor.matchBrackets": false
+                "editor.matchBrackets": "never",
+                "editor.parameterHints.enabled": false
             }
         },
         "configuration": [