diff --git a/Core/core.py b/Core/core.py
index ffdaee29e..d1703a6ac 100644
--- a/Core/core.py
+++ b/Core/core.py
@@ -302,6 +302,8 @@ class GajimCore:
 		except:
 			print _("creating %s") % fname
 			fic = open(fname, "w")
+			import stat
+			os.chmod(fname, stat.S_IRUSR | stat.S_IWUSR)
 			fic.close()
 		self.cfgParser = common.optparser.OptionsParser(CONFPATH)
 		for part in default_tab.keys():
diff --git a/common/optparser.py b/common/optparser.py
index 924876753..537c359b0 100644
--- a/common/optparser.py
+++ b/common/optparser.py
@@ -82,10 +82,15 @@ class OptionsParser:
 		except:
 			log.debug("Can't write config %s" % self.__fname)
 			return 0
+		index = 0
 		for s in self.tab.keys():
-			fd.write('[' + s + ']\n\n')
+			if index == 0:
+				fd.write('[' + s + ']\n')
+			else:
+				fd.write('\n[' + s + ']\n')
 			for o in self.tab[s].keys():
 				fd.write(o + ' = ' + str(self.tab[s][o]) + '\n')
+			index += 1
 		return 1
 	# END writeCfgFile