diff --git a/app/assets/stylesheets/admin.css.less b/app/assets/stylesheets/admin.css.less
index 6f6f364..3a52df1 100644
--- a/app/assets/stylesheets/admin.css.less
+++ b/app/assets/stylesheets/admin.css.less
@@ -227,6 +227,7 @@
     top: 100%;
     right: 0;
     left:45%;
+    width: 100%;
     z-index: 99;
     display: none;
     float: right;
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
index 44cbede..0ea69dc 100644
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -244,6 +244,7 @@
     top: 100%;
     right: 0;
     left:45%;
+    width: 100%;
     z-index: 99;
     display: none;
     float: right;
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index d6ba1ac..59b52b5 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -75,6 +75,17 @@
     	successfully_updated = @user.update_without_password(params[:user])
     end
 
+    # If the user selected a new language setting, go ahead and reset the locale
+    
+puts "PARAMS: #{params.inspect}"
+    
+    if params[:user][:language_id]
+      if @user.language_id != params[:user][:language_id]
+        params[:locale] = Language.find(params[:user][:language_id]).abbreviation
+        set_locale 
+      end
+    end
+    
     #unlink shibboleth from user's details
     if params[:unlink_flag] == 'true' then
       @user.update_attributes(:shibboleth_id => "")