diff --git a/config/application.rb b/config/application.rb
index 3f2a0861a..2b842992b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -24,7 +24,6 @@ module Consul
     config.i18n.available_locales = [:en, :es]
 
     # Add the new directories to the locales load path
-    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
 
     config.assets.paths << Rails.root.join("app", "assets", "fonts")
 
@@ -44,6 +43,7 @@ module Consul
     config.autoload_paths << "#{Rails.root}/app/controllers/custom"
     config.autoload_paths << "#{Rails.root}/app/models/custom"
     config.paths['app/views'].unshift(Rails.root.join('app', 'views', 'custom'))
+    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'custom', '*.{rb,yml}')]
 
   end
 end
diff --git a/spec/customization_engine_spec.rb b/spec/customization_engine_spec.rb
new file mode 100644
index 000000000..d68811c73
--- /dev/null
+++ b/spec/customization_engine_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+# This module tests functionality related with custom application files
+# TODO test models, controllers, etc...
+
+describe 'CustomizationEngine' do
+
+  let(:test_key) { I18n.t('account.show.change_credentials_link') }
+
+  it "should load custom and override original locales" do
+    I18n.load_path += Dir[Rails.root.join('spec', 'support', 'locales', 'custom', '*.{rb,yml}')]
+    I18n.reload!
+    expect(test_key).to eq 'Overriden string with custom locales'
+  end
+
+  it "should not override original locales" do
+    I18n.load_path.delete_if {|item| item =~ /spec\/support\/locales\/custom/ }
+    I18n.load_path += Dir[Rails.root.join('spec', 'support', 'locales', '**', '*.{rb,yml}')]
+    I18n.reload!
+    expect(test_key).to eq 'Not overriden string with custom locales'
+  end
+end
diff --git a/spec/support/locales/custom/en.yml b/spec/support/locales/custom/en.yml
new file mode 100644
index 000000000..f601a35bc
--- /dev/null
+++ b/spec/support/locales/custom/en.yml
@@ -0,0 +1,5 @@
+---
+en:
+  account:
+    show:
+      change_credentials_link: Overriden string with custom locales
diff --git a/spec/support/locales/en.yml b/spec/support/locales/en.yml
new file mode 100644
index 000000000..c1174677b
--- /dev/null
+++ b/spec/support/locales/en.yml
@@ -0,0 +1,5 @@
+---
+en:
+  account:
+    show:
+      change_credentials_link: Not overriden string with custom locales