diff --git a/electrum b/electrum
index c571258c7..83a5869a0 100755
--- a/electrum
+++ b/electrum
@@ -147,7 +147,6 @@ if __name__ == '__main__':
     parser = arg_parser()
     options, args = parser.parse_args()
     set_verbosity(options.verbose)
-    set_language(options.language)
 
     # config is an object passed to the various constructors (wallet, interface, gui)
     if 'ANDROID_DATA' in os.environ:
@@ -208,6 +207,7 @@ if __name__ == '__main__':
         interface.start()
         interface.send([('server.peers.subscribe',[])])
 
+        set_language(config.get('language'))
         gui = gui.ElectrumGui(wallet, config)
 
         found = config.wallet_file_exists
diff --git a/lib/i18n.py b/lib/i18n.py
index c39031672..7ef4458fb 100644
--- a/lib/i18n.py
+++ b/lib/i18n.py
@@ -23,8 +23,6 @@ if os.path.exists('./locale'):
 else:
     LOCALE_DIR = '/usr/share/locale'
 
-print LOCALE_DIR
-
 language = gettext.translation('electrum', LOCALE_DIR, fallback = True)
 
 def _(x):