diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index cde0c33..d6ba1ac 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,6 +1,10 @@
 # app/controllers/registrations_controller.rb
 class RegistrationsController < Devise::RegistrationsController
 
+  def edit
+    @languages = Language.all.order("name")
+  end
+
   # POST /resource
   def create
     logger.debug "#{sign_up_params}"
@@ -57,7 +61,6 @@
   end
 
   def do_update(require_password = true, confirm = false)
-
 	  if require_password then
 		  successfully_updated = if needs_password?(@user, params)
       @user.update_with_password(params[:user])
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index bb25316..7357115 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -53,10 +53,15 @@
 			</tr>
       <tr>
         <td class="first"><%= t('helpers.user_details_language') %></td>
-        <td><%= collection_select(:user,
-                                  :language_id, Language.all.order("name"),
-                                  :id, :name, {:selected => Language.where(default_language: true).first.id},
-                                  {:class => "typeahead org_sign_up"}) %></td>
+        <td>
+					<!-- For some reason the rails collection_select and f.select would not 'select' the current language, so reverting to HTML -->
+					<select id="user_language_id" name="user[language_id]" class="typeahead org_sign_up">
+						<%= @languages.each do |l| %>
+							<option value="<%= l.id %>"<%= (current_user.language_id == l.id || (current_user.language_id.nil? && l.default_language) ? ' selected="selected"' : '') %>><%= l.name %></option>
+						<% end %>
+					</select>
+					
+				</td>
       </tr>
 			<tr>
 				<td class="first"><%= t("helpers.orcid_id") %></td>