diff --git a/plugin/youcompleteme.vim b/plugin/youcompleteme.vim
index 24f9f504..f8465da0 100644
--- a/plugin/youcompleteme.vim
+++ b/plugin/youcompleteme.vim
@@ -100,6 +100,19 @@ let g:ycm_key_detailed_diagnostics =
 let g:ycm_cache_omnifunc =
       \ get( g:, 'ycm_cache_omnifunc', 1 )
 
+let g:ycm_server_use_vim_stdout =
+      \ get( g:, 'ycm_server_use_vim_stdout', 0 )
+
+let g:ycm_server_log_level =
+      \ get( g:, 'ycm_server_log_level', 'info' )
+
+let g:ycm_server_keep_logfiles =
+      \ get( g:, 'ycm_server_keep_logfiles', 0 )
+
+let g:ycm_server_idle_shutdown_seconds =
+      \ get( g:, 'ycm_server_idle_shutdown_seconds', 43200 )
+
+
 " On-demand loading. Let's use the autoload folder and not slow down vim's
 " startup procedure.
 augroup youcompletemeStart
diff --git a/python/ycm/server/default_settings.json b/python/ycm/server/default_settings.json
index 3cfdbc65..df4b3204 100644
--- a/python/ycm/server/default_settings.json
+++ b/python/ycm/server/default_settings.json
@@ -26,10 +26,6 @@
     "unite": 1,
     "text": 1
   },
-  "server_use_vim_stdout": 0,
-  "server_log_level": "info",
-  "server_keep_logfiles": 0,
-  "server_idle_shutdown_seconds": 43200,
   "auto_start_csharp_server": 1,
   "auto_stop_csharp_server": 1,
   "csharp_server_port": 2000