diff --git a/mpw-ssh b/mpw-ssh
index 83f835e..39fe1b3 100755
--- a/mpw-ssh
+++ b/mpw-ssh
@@ -15,7 +15,7 @@ require "#{APP_ROOT}/lib/CliSSH.rb"
 lang = Locale::Tag.parse(ENV['LANG']).to_simple.to_s[0..1]
 
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-I18n.load_path = Dir["#{APP_ROOT}/i18n/*.yml"]
+I18n.load_path = Dir["#{APP_ROOT}/i18n/cli/*.yml"]
 I18n.default_locale = :en
 I18n.locale = lang.to_sym
 
@@ -63,6 +63,8 @@ elsif ARGV.length < 1
 	puts "#{I18n.t('ssh.option.usage')}: mpw-ssh SEARCH [options]"
 	exit 2
 else
+	cli.decrypt()
+	cli.sync()
 	cli.ssh(search)
 end