diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index da7799397e..003214cd02 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -79,7 +79,7 @@ apipatterns = [
 settings_urls = [
 
     url(r'^user/?', SettingsView.as_view(template_name='InvenTree/settings/user.html'), name='settings-user'),
-    url(r'^theme/?', ColorThemeSelectView.as_view(), name='settings-theme'),
+    url(r'^i18n/?', include('django.conf.urls.i18n')),
    
     url(r'^global/?', SettingsView.as_view(template_name='InvenTree/settings/global.html'), name='settings-global'),
     url(r'^report/?', SettingsView.as_view(template_name='InvenTree/settings/report.html'), name='settings-report'),
diff --git a/InvenTree/templates/InvenTree/settings/theme.html b/InvenTree/templates/InvenTree/settings/theme.html
index d7b006d13c..f0f9872774 100644
--- a/InvenTree/templates/InvenTree/settings/theme.html
+++ b/InvenTree/templates/InvenTree/settings/theme.html
@@ -16,7 +16,7 @@
     <div class='col-sm-6'>
         <h4>{% trans "Color Themes" %}</h4>
     </div>
-</div>    
+</div>
 
 <form action="{% url 'settings-theme' %}" method="post">
     {% csrf_token %}
@@ -33,4 +33,35 @@
     </div>
 {% endif %}
 
+
+<div class='row'>
+    <div class='col-sm-6'>
+        <h4>{% trans "Language" %}</h4>
+    </div>
+</div>
+
+
+
+<div class="row">
+    <form action="{% url 'set_language' %}" method="post">{% csrf_token %}
+        <input name="next" type="hidden" value="">
+        <div class="col-sm-6" style="width: 200px;"><div id="div_id_name" class="form-group"><div class="controls ">
+            <select name="language" class="select form-control">
+                {% get_current_language as LANGUAGE_CODE %}
+                {% get_available_languages as LANGUAGES %}
+                {% get_language_info_list for LANGUAGES as languages %}
+                {% for language in languages %}
+                    <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected{% endif %}>
+                        {{ language.name_local }} ({{ language.code }})
+                    </option>
+                {% endfor %}
+            </select>
+        </div></div></div>
+        <div class="col-sm-6" style="width: auto;">
+            <input type="submit" value="{% trans 'Set Language' %}" class="btn btn btn-primary">
+        </div>
+    </form>
+</div>
+
+
 {% endblock %}