diff --git a/src/common.py b/src/common.py
index ff453ba7c..70833cd7e 100644
--- a/src/common.py
+++ b/src/common.py
@@ -24,7 +24,10 @@ import xdg, xdg.BaseDirectory
 import gettext
 
 PROGRAM_NAME = "Deluge"
-PROGRAM_VERSION = "0.5"
+PROGRAM_VERSION = "0.5.1"
+
+CLIENT_CODE = "DE"
+CLIENT_VERSION = "0510"
 
 CONFIG_DIR = xdg.BaseDirectory.save_config_path('deluge')
 
diff --git a/src/interface.py b/src/interface.py
index 97fe99bed..fd3debd8a 100644
--- a/src/interface.py
+++ b/src/interface.py
@@ -84,19 +84,9 @@ class DelugeGTK:
 			f.flush()
 			f.close()
 		#Start the Deluge Manager:
-		p = "DE"
-		v = "0500"
-		s = "%s %s"%(common.PROGRAM_NAME, common.PROGRAM_VERSION)
-		#try:
-		#	self.manager = core.Manager(p, v, s, common.CONFIG_DIR)
-		#except:
-		#	# If something goes wrong while restoring the session, then load
-		#	# a blank state rather than crash and exit
-		#	self.manager = core.Manager(p, v, s, common.CONFIG_DIR, blank_slate=True)
-		#	self.something_screwed_up = True
-		self.manager = core.Manager(p, v, s, common.CONFIG_DIR)
+		self.manager = core.Manager(common.CLIENT_CODE, common.CLIENT_VERSION, 
+			'%s %s'%(common.PROGRAM_NAME, common.PROGRAM_VERSION), common.CONFIG_DIR)
 		self.something_screwed_up = False
-		#else: self.something_screwed_up = False
 		self.plugins = plugins.PluginManager(self.manager, self)
 		self.plugins.add_plugin_dir(common.PLUGIN_DIR)
 		if os.path.isdir(os.path.join(common.CONFIG_DIR , 'plugins')):