diff --git a/app/assets/javascripts/supplier/app/components/language-switcher.js.coffee b/app/assets/javascripts/supplier/app/components/language-switcher.js.coffee
index 2fc9781b..f6becb74 100644
--- a/app/assets/javascripts/supplier/app/components/language-switcher.js.coffee
+++ b/app/assets/javascripts/supplier/app/components/language-switcher.js.coffee
@@ -1,7 +1,9 @@
 App.LanguageSwitcherComponent = Ember.Component.extend
   classNames: ['language-switcher-container']
   locales: (-> ['en', 'nl']).property()
+  current_locale: (-> Qstorage.getItem('locale') ).property()
   actions:
     switchTo: (locale)->
       setLocale locale
+      @set 'current_locale', locale
       @get('targetObject.store').all("page").invoke 'reload'
diff --git a/app/assets/javascripts/supplier/app/helpers/isCurrentLocale.js.coffee b/app/assets/javascripts/supplier/app/helpers/isCurrentLocale.js.coffee
new file mode 100644
index 00000000..956b9fca
--- /dev/null
+++ b/app/assets/javascripts/supplier/app/helpers/isCurrentLocale.js.coffee
@@ -0,0 +1,5 @@
+Ember.Handlebars.helper 'isCurrentLocale', (locale, options)->
+  if locale is 'nl'
+    options.fn @
+  else
+    options.inverse @
diff --git a/app/assets/javascripts/supplier/app/templates/components/language-switcher-button.emblem b/app/assets/javascripts/supplier/app/templates/components/language-switcher-button.emblem
new file mode 100644
index 00000000..c251772a
--- /dev/null
+++ b/app/assets/javascripts/supplier/app/templates/components/language-switcher-button.emblem
@@ -0,0 +1 @@
+= flag locale
diff --git a/app/assets/javascripts/supplier/app/templates/components/language-switcher.emblem b/app/assets/javascripts/supplier/app/templates/components/language-switcher.emblem
index 1d0e302e..1296ac56 100644
--- a/app/assets/javascripts/supplier/app/templates/components/language-switcher.emblem
+++ b/app/assets/javascripts/supplier/app/templates/components/language-switcher.emblem
@@ -1,2 +1,2 @@
 each locale in locales
-  a.language-switch-button{ action "switchTo" locale}= flag locale
+  view language-switcher-button locale=locale
diff --git a/app/assets/javascripts/supplier/app/views/language-switcher-button.js.coffee b/app/assets/javascripts/supplier/app/views/language-switcher-button.js.coffee
new file mode 100644
index 00000000..24d6b801
--- /dev/null
+++ b/app/assets/javascripts/supplier/app/views/language-switcher-button.js.coffee
@@ -0,0 +1,8 @@
+App.LanguageSwitcherButtonView = Ember.View.extend
+  tagName: 'a'
+  templateName: 'components/language-switcher-button'
+  classNameBindings: ['isCurrent:current']
+  classNames: ['language-switch-button']
+  isCurrent: Ember.computed 'locale', 'controller.current_locale', ->
+    @get('locale') is @get('controller.current_locale')
+  click: -> @get('controller').send 'switchTo', @get('locale')
diff --git a/app/assets/stylesheets/supplier/foundation1/_qconstants.css.sass b/app/assets/stylesheets/supplier/foundation1/_qconstants.css.sass
index 9274a867..3a6ff448 100644
--- a/app/assets/stylesheets/supplier/foundation1/_qconstants.css.sass
+++ b/app/assets/stylesheets/supplier/foundation1/_qconstants.css.sass
@@ -3,3 +3,4 @@ $qbrown: #853d15
 $qbrown-active: lighten($qbrown, 20%)
 $wood: image-url('textures/theme1.jpg')
 $background-brown: #57351f
+$current-color: #fc3
diff --git a/app/assets/stylesheets/supplier/foundation1/components/_language_switcher.css.sass b/app/assets/stylesheets/supplier/foundation1/components/_language_switcher.css.sass
index 5f5a6593..a4228646 100644
--- a/app/assets/stylesheets/supplier/foundation1/components/_language_switcher.css.sass
+++ b/app/assets/stylesheets/supplier/foundation1/components/_language_switcher.css.sass
@@ -3,3 +3,8 @@
     +button($bg: $secondary-color, $padding: $button-tny)
     margin:  0
     margin-right: 8px
+    &.current
+      +button($bg: $current-color, $padding: $button-tny)
+      margin:  0
+      margin-right: 8px
+      border: 1px solid #333
diff --git a/config/locales/models.en.yml b/config/locales/models.en.yml
index 6344ec1d..776f55aa 100644
--- a/config/locales/models.en.yml
+++ b/config/locales/models.en.yml
@@ -64,6 +64,10 @@ en:
         location: Location
         time_zone: Time zone
         iens_profile: Iens profile id
+        address: Addres
+        postal_code: Postal code
+        city: City
+        country: Country
       table:
         number: Number
         from_number: From number