diff --git a/docs/bot-usage.md b/docs/bot-usage.md
index 56e6008a1..dbc111d44 100644
--- a/docs/bot-usage.md
+++ b/docs/bot-usage.md
@@ -58,9 +58,10 @@ Common arguments:
                         details.
   -V, --version         show program's version number and exit
   -c PATH, --config PATH
-                        Specify configuration file (default: `config.json`).
-                        Multiple --config options may be used. Can be set to
-                        `-` to read config from stdin.
+                        Specify configuration file (default:
+                        `userdir/config.json` or `config.json` whichever
+                        exists). Multiple --config options may be used. Can be
+                        set to `-` to read config from stdin.
   -d PATH, --datadir PATH
                         Path to directory with historical backtesting data.
   --userdir PATH, --user-data-dir PATH
@@ -71,6 +72,7 @@ Strategy arguments:
                         Specify strategy class name which will be used by the
                         bot.
   --strategy-path PATH  Specify additional strategy lookup path.
+.
 
 ```
 
@@ -242,12 +244,15 @@ optional arguments:
 
 Common arguments:
   -v, --verbose         Verbose mode (-vv for more, -vvv to get all messages).
-  --logfile FILE        Log to the file specified.
+  --logfile FILE        Log to the file specified. Special values are:
+                        'syslog', 'journald'. See the documentation for more
+                        details.
   -V, --version         show program's version number and exit
   -c PATH, --config PATH
-                        Specify configuration file (default: `config.json`).
-                        Multiple --config options may be used. Can be set to
-                        `-` to read config from stdin.
+                        Specify configuration file (default:
+                        `userdir/config.json` or `config.json` whichever
+                        exists). Multiple --config options may be used. Can be
+                        set to `-` to read config from stdin.
   -d PATH, --datadir PATH
                         Path to directory with historical backtesting data.
   --userdir PATH, --user-data-dir PATH
@@ -280,7 +285,7 @@ usage: freqtrade hyperopt [-h] [-v] [--logfile FILE] [-V] [-c PATH] [-d PATH]
                           [--stake-amount STAKE_AMOUNT] [--fee FLOAT]
                           [--hyperopt NAME] [--hyperopt-path PATH] [--eps]
                           [-e INT]
-                          [--spaces {all,buy,sell,roi,stoploss} [{all,buy,sell,roi,stoploss} ...]]
+                          [--spaces {all,buy,sell,roi,stoploss,trailing,default} [{all,buy,sell,roi,stoploss,trailing,default} ...]]
                           [--dmmp] [--print-all] [--no-color] [--print-json]
                           [-j JOBS] [--random-state INT] [--min-trades INT]
                           [--continue] [--hyperopt-loss NAME]
@@ -308,9 +313,9 @@ optional arguments:
                         Allow buying the same pair multiple times (position
                         stacking).
   -e INT, --epochs INT  Specify number of epochs (default: 100).
-  --spaces {all,buy,sell,roi,stoploss} [{all,buy,sell,roi,stoploss} ...]
+  --spaces {all,buy,sell,roi,stoploss,trailing,default} [{all,buy,sell,roi,stoploss,trailing,default} ...]
                         Specify which parameters to hyperopt. Space-separated
-                        list. Default: `all`.
+                        list.
   --dmmp, --disable-max-market-positions
                         Disable applying `max_open_trades` during backtest
                         (same as setting `max_open_trades` to a very high
@@ -338,16 +343,20 @@ optional arguments:
                         target for optimization is different. Built-in
                         Hyperopt-loss-functions are: DefaultHyperOptLoss,
                         OnlyProfitHyperOptLoss, SharpeHyperOptLoss,
-                        SharpeHyperOptLossDaily (default: `DefaultHyperOptLoss`).
+                        SharpeHyperOptLossDaily.(default:
+                        `DefaultHyperOptLoss`).
 
 Common arguments:
   -v, --verbose         Verbose mode (-vv for more, -vvv to get all messages).
-  --logfile FILE        Log to the file specified.
+  --logfile FILE        Log to the file specified. Special values are:
+                        'syslog', 'journald'. See the documentation for more
+                        details.
   -V, --version         show program's version number and exit
   -c PATH, --config PATH
-                        Specify configuration file (default: `config.json`).
-                        Multiple --config options may be used. Can be set to
-                        `-` to read config from stdin.
+                        Specify configuration file (default:
+                        `userdir/config.json` or `config.json` whichever
+                        exists). Multiple --config options may be used. Can be
+                        set to `-` to read config from stdin.
   -d PATH, --datadir PATH
                         Path to directory with historical backtesting data.
   --userdir PATH, --user-data-dir PATH
@@ -358,6 +367,7 @@ Strategy arguments:
                         Specify strategy class name which will be used by the
                         bot.
   --strategy-path PATH  Specify additional strategy lookup path.
+
 ```
 
 ## Edge commands
@@ -394,12 +404,15 @@ optional arguments:
 
 Common arguments:
   -v, --verbose         Verbose mode (-vv for more, -vvv to get all messages).
-  --logfile FILE        Log to the file specified.
+  --logfile FILE        Log to the file specified. Special values are:
+                        'syslog', 'journald'. See the documentation for more
+                        details.
   -V, --version         show program's version number and exit
   -c PATH, --config PATH
-                        Specify configuration file (default: `config.json`).
-                        Multiple --config options may be used. Can be set to
-                        `-` to read config from stdin.
+                        Specify configuration file (default:
+                        `userdir/config.json` or `config.json` whichever
+                        exists). Multiple --config options may be used. Can be
+                        set to `-` to read config from stdin.
   -d PATH, --datadir PATH
                         Path to directory with historical backtesting data.
   --userdir PATH, --user-data-dir PATH
@@ -410,6 +423,7 @@ Strategy arguments:
                         Specify strategy class name which will be used by the
                         bot.
   --strategy-path PATH  Specify additional strategy lookup path.
+
 ```
 
 To understand edge and how to read the results, please read the [edge documentation](edge.md).
diff --git a/freqtrade/commands/arguments.py b/freqtrade/commands/arguments.py
index d37870ea0..580c9e298 100644
--- a/freqtrade/commands/arguments.py
+++ b/freqtrade/commands/arguments.py
@@ -111,10 +111,14 @@ class Arguments:
             conf_required = ('command' in parsed_arg and parsed_arg.command in NO_CONF_REQURIED)
 
             if 'user_data_dir' in parsed_arg and parsed_arg.user_data_dir is not None:
+                user_dir = parsed_arg.user_data_dir
+            else:
+                # Default case
+                user_dir = 'user_data'
                 # Try loading from "user_data/config.json"
-                cfgfile = Path(parsed_arg.user_data_dir) / DEFAULT_CONFIG
-                if cfgfile.is_file() or not conf_required:
-                    parsed_arg.config = [str(cfgfile)]
+            cfgfile = Path(user_dir) / DEFAULT_CONFIG
+            if cfgfile.is_file():
+                parsed_arg.config = [str(cfgfile)]
             else:
                 # Else use "config.json".
                 cfgfile = Path.cwd() / DEFAULT_CONFIG
diff --git a/tests/test_arguments.py b/tests/test_arguments.py
index 60da0082a..61bca04a4 100644
--- a/tests/test_arguments.py
+++ b/tests/test_arguments.py
@@ -18,7 +18,8 @@ def test_parse_args_none() -> None:
     assert isinstance(arguments.parser, argparse.ArgumentParser)
 
 
-def test_parse_args_defaults() -> None:
+def test_parse_args_defaults(mocker) -> None:
+    mocker.patch.object(Path, "is_file", MagicMock(side_effect=[False, True]))
     args = Arguments(['trade']).get_parsed_arg()
     assert args["config"] == ['config.json']
     assert args["strategy_path"] is None
@@ -26,6 +27,25 @@ def test_parse_args_defaults() -> None:
     assert args["verbosity"] == 0
 
 
+def test_parse_args_default_userdatadir(mocker) -> None:
+    mocker.patch.object(Path, "is_file", MagicMock(return_value=True))
+    args = Arguments(['trade']).get_parsed_arg()
+    # configuration defaults to user_data if that is available.
+    assert args["config"] == ['user_data/config.json']
+    assert args["strategy_path"] is None
+    assert args["datadir"] is None
+    assert args["verbosity"] == 0
+
+
+def test_parse_args_userdatadir(mocker) -> None:
+    mocker.patch.object(Path, "is_file", MagicMock(return_value=True))
+    args = Arguments(['trade', '--user-data-dir', 'user_data']).get_parsed_arg()
+    # configuration defaults to user_data if that is available.
+    assert args["config"] == ['user_data/config.json']
+    assert args["strategy_path"] is None
+    assert args["datadir"] is None
+    assert args["verbosity"] == 0
+
 def test_parse_args_config() -> None:
     args = Arguments(['trade', '-c', '/dev/null']).get_parsed_arg()
     assert args["config"] == ['/dev/null']
@@ -208,7 +228,7 @@ def test_config_notrequired(mocker) -> None:
     assert pargs["config"] is None
 
     # When file exists:
-    mocker.patch.object(Path, "is_file", MagicMock(return_value=True))
+    mocker.patch.object(Path, "is_file", MagicMock(side_effect=[False, True]))
     args = [
         'download-data',
     ]
diff --git a/tests/test_main.py b/tests/test_main.py
index 1229f748a..70b784002 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -5,8 +5,9 @@ from unittest.mock import MagicMock, PropertyMock
 
 import pytest
 
+from pathlib import Path
 from freqtrade.commands import Arguments
-from freqtrade.exceptions import OperationalException, FreqtradeException
+from freqtrade.exceptions import FreqtradeException, OperationalException
 from freqtrade.freqtradebot import FreqtradeBot
 from freqtrade.main import main
 from freqtrade.state import State
@@ -26,6 +27,7 @@ def test_parse_args_backtesting(mocker) -> None:
     Test that main() can start backtesting and also ensure we can pass some specific arguments
     further argument parsing is done in test_arguments.py
     """
+    mocker.patch.object(Path, "is_file", MagicMock(side_effect=[False, True]))
     backtesting_mock = mocker.patch('freqtrade.commands.start_backtesting')
     backtesting_mock.__name__ = PropertyMock("start_backtesting")
     # it's sys.exit(0) at the end of backtesting
@@ -42,6 +44,7 @@ def test_parse_args_backtesting(mocker) -> None:
 
 
 def test_main_start_hyperopt(mocker) -> None:
+    mocker.patch.object(Path, "is_file", MagicMock(side_effect=[False, True]))
     hyperopt_mock = mocker.patch('freqtrade.commands.start_hyperopt', MagicMock())
     hyperopt_mock.__name__ = PropertyMock("start_hyperopt")
     # it's sys.exit(0) at the end of hyperopt