2 files changed, 3 insertions, 4 deletions
diff --git a/lib/leap_cli/commands/shell.rb b/lib/leap_cli/commands/shell.rb
index 5c16f92..2822481 100644
--- a/lib/leap_cli/commands/shell.rb
+++ b/lib/leap_cli/commands/shell.rb
@@ -35,11 +35,10 @@ module LeapCli; module Commands
     if cmd == :ssh
       command = "#{ssh} #{node.name}"
     elsif cmd == :mosh
-      command = "mosh --ssh \"#{ssh}\" #{node.name}"
+      command = "MOSH_TITLE_NOPREFIX=1 mosh --ssh \"#{ssh}\" #{node.name}"
     end
     log 2, command
-    title = "echo -n \"\\033]0;#{username}@#{node.domain.full}\007\""
-    exec "#{title} && #{command}"
+    exec "#{command}"
   end
 
 end; end
 \ No newline at end of file
diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb
index b515650..f967db1 100644
--- a/lib/leap_cli/remote/tasks.rb
+++ b/lib/leap_cli/remote/tasks.rb
@@ -14,7 +14,7 @@ end
 
 task :install_prerequisites, :max_hosts => MAX_HOSTS do
   leap.mkdirs LeapCli::PUPPET_DESTINATION
-  run "locale-gen"
+  run "echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen; locale-gen"
   leap.log :updating, "package list" do
     run "apt-get update"
   end