diff --git a/gns3server/handlers/file_upload_handler.py b/gns3server/handlers/file_upload_handler.py
index 93e9158c..c819a401 100644
--- a/gns3server/handlers/file_upload_handler.py
+++ b/gns3server/handlers/file_upload_handler.py
@@ -44,7 +44,7 @@ class FileUploadHandler(tornado.web.RequestHandler):
         config = Config.instance()
         server_config = config.get_default_section()
         self._upload_dir = os.path.expandvars(
-            os.path.expanduser(server_config.get("upload_directory", "~/Documents/GNS3/images")))
+            os.path.expanduser(server_config.get("upload_directory", "~/GNS3/images")))
         self._host = request.host
         try:
             os.makedirs(self._upload_dir)
diff --git a/gns3server/server.py b/gns3server/server.py
index 60d2b998..ded769b6 100644
--- a/gns3server/server.py
+++ b/gns3server/server.py
@@ -79,8 +79,8 @@ class Server(object):
         # get the projects and temp directories from the configuration file (passed to the modules)
         config = Config.instance()
         server_config = config.get_default_section()
-        # default projects directory is "~/Documents/GNS3/projects"
-        self._projects_dir = os.path.expandvars(os.path.expanduser(server_config.get("projects_directory", "~/Documents/GNS3/projects")))
+        # default projects directory is "~/GNS3/projects"
+        self._projects_dir = os.path.expandvars(os.path.expanduser(server_config.get("projects_directory", "~/GNS3/projects")))
         self._temp_dir = server_config.get("temporary_directory", tempfile.gettempdir())
 
         try: