diff --git a/modules/client_locales/locales.lua b/modules/client_locales/locales.lua
index f9afaf7a..ab531b44 100644
--- a/modules/client_locales/locales.lua
+++ b/modules/client_locales/locales.lua
@@ -1,7 +1,10 @@
+-- TIP: to find all possible translations in the modules directory use the following command
+-- find \( -name "*.lua" -o -name "*.otui" \) -exec grep -oE "tr\\("(\\\\"|[^"])*"" {} \; -exec grep -oE "tr\\(\"(\\\\\"|[^\"])*\nil {} \; | sort | uniq | sed "s/^tr(.\(.*\).$/[\"\1\"] = nil,/"
+
 Locales = { }
 
 -- private variables
-local defaultLocaleName = 'en-us'
+local defaultLocaleName = 'en'
 local installedLocales
 local currentLocale
 local localeComboBox
@@ -20,15 +23,14 @@ function Locales.init()
   Locales.installLocales('locales')
 
   local userLocaleName = Settings.get('locale')
-  if userLocaleName then
+  if userLocaleName and Locales.setLocale(userLocaleName)then
     print('Using configurated locale: ' .. userLocaleName)
-    Locales.setLocale(userLocaleName)
   else
     print('Using default locale: ' .. defaultLocaleName)
     Locales.setLocale(defaultLocaleName)
     Settings.set('locale', defaultLocaleName)
   end
---[[
+
   addEvent( function()
               localeComboBox = createWidget('ComboBox', rootWidget:recursiveGetChildById('rightButtonsPanel'))
               for key,value in pairs(installedLocales) do
@@ -37,7 +39,6 @@ function Locales.init()
               localeComboBox:setCurrentOption(currentLocale.languageName)
               localeComboBox.onOptionChange = onLocaleComboBoxOptionChange
             end, false)
-            ]]--
 end
 
 function Locales.terminate()
@@ -71,9 +72,11 @@ end
 function Locales.setLocale(name)
   local locale = installedLocales[name]
   if not locale then
-    error("Locale " .. name .. ' does not exist.')
+    warning("Locale " .. name .. ' does not exist.')
+    return false
   end
   currentLocale = locale
+  return true
 end
 
 function tr(text, ...)
diff --git a/modules/client_locales/locales/en-us.lua b/modules/client_locales/locales/en-us.lua
deleted file mode 100644
index 2c65a3de..00000000
--- a/modules/client_locales/locales/en-us.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-locale = {
-  name = 'en-us',
-  languageName = 'English',
-
-  -- Translations not needed. en-us is already default.
-  translation = {}
-}
-
-Locales.installLocale(locale)
\ No newline at end of file
diff --git a/modules/client_locales/locales/en.lua b/modules/client_locales/locales/en.lua
new file mode 100644
index 00000000..b87eb64a
--- /dev/null
+++ b/modules/client_locales/locales/en.lua
@@ -0,0 +1,9 @@
+locale = {
+  name = "en",
+  languageName = "English",
+
+  -- translations are not needed because everything is already in english
+  translation = {}
+}
+
+Locales.installLocale(locale)
diff --git a/modules/client_locales/locales/pt-br.lua b/modules/client_locales/locales/pt.lua
similarity index 95%
rename from modules/client_locales/locales/pt-br.lua
rename to modules/client_locales/locales/pt.lua
index c7555de1..1ce15bdd 100644
--- a/modules/client_locales/locales/pt-br.lua
+++ b/modules/client_locales/locales/pt.lua
@@ -1,8 +1,5 @@
--- to find all possible translations in the source code use the following command:
--- find \( -name "*.lua" -o -name "*.otui" \) -exec grep -oE "tr\\("(\\\\"|[^"])*"" {} \; -exec grep -oE "tr\\(\"(\\\\\"|[^\"])*\nil {} \; | sort | uniq | sed "s/^tr(.\(.*\).$/[\"\1\"] = nil,/"
-
 locale = {
-  name = "pt-br",
+  name = "pt",
   languageName = "Português",
 
   -- As traduções devem vir sempre em ordem alfabética.
@@ -198,8 +195,6 @@ locale = {
     ["You may not logout or enter a protection zone"] = "Você não pode sair ou entrar em uma zona de proteção",
     ["You must select a character to login!"] = "Você deve selecionar um personagem para entrar!",
   }
-
-  -- Adicionar informações de números. 1.000  100,00  1.000,00 etc.
 }
 
-Locales.installLocale(locale)
\ No newline at end of file
+Locales.installLocale(locale)