diff --git a/dvc/command/config.py b/dvc/command/config.py
index 9c6ed3461..8db88b509 100644
--- a/dvc/command/config.py
+++ b/dvc/command/config.py
@@ -12,7 +12,7 @@ class CmdConfig(CmdBase):
 
         # Using configobj because it doesn't
         # drop comments like configparser does.
-        self.configobj = configobj.ConfigObj(self._config_path)
+        self.configobj = configobj.ConfigObj(self._config_path, write_empty_values=True)
 
     @property
     def _config_path(self):
@@ -82,7 +82,7 @@ class CmdConfig(CmdBase):
         if self.parsed_args.unset:
             return self.unset()
 
-        if self.parsed_args.value == None:
+        if self.parsed_args.value is None:
             return self.show()
 
         return self.set()
diff --git a/dvc/command/init.py b/dvc/command/init.py
index 96cfc3fd8..1e267a40e 100644
--- a/dvc/command/init.py
+++ b/dvc/command/init.py
@@ -19,14 +19,14 @@ class CmdInit(CmdBase):
 DataDir = {}
 
 # Default target
-Target =
+Target = 
 
 # Supported clouds: AWS, GCP
 Cloud = AWS
 
 # This global storage path is going to be deprecated in the next version.
 # Please use StoragePath from a specific cloud instead.
-#StoragePath =
+#StoragePath = 
 
 # Log levels: Debug, Info, Warning and Error
 LogLevel = Info
@@ -41,7 +41,7 @@ StoragePath = dvc/tutorial
 Type = t2.nano
 Image = ami-2d39803a
 
-SpotPrice =
+SpotPrice = 
 SpotTimeout = 300
 
 KeyPairName = dvc-key
@@ -59,8 +59,8 @@ EbsOptimized = false
 AllDisksAsRAID0 = false
 
 [GCP]
-StoragePath =
-ProjectName =
+StoragePath = 
+ProjectName = 
 '''
 
     EMPTY_FILE_NAME = '.empty'