diff --git a/root/account/edit.tt b/root/account/edit.tt
index 7b037624aef..e4f311694cf 100644
--- a/root/account/edit.tt
+++ b/root/account/edit.tt
@@ -65,7 +65,7 @@
             </span>
             [% extra_field = form.field('languages').field(form.field('languages').add_extra(1) - 1) %]
             <span id="add-language-template" style="display: none">
-              [% r.select(extra_field.field('language_id'), id => 'fluency-template', class => 'language_id',) %]
+              [% r.select(extra_field.field('language_id'), class => 'language_id') %]
               [% r.select(extra_field.field('fluency'), class => 'fluency') %]
               <span class="buttons inline">
                 <button type="button" class="remove negative">[% l('Remove') %]</button>
@@ -77,6 +77,9 @@
 
       <script>//<![CDATA[
       $(function () {
+          $(document.body).append( $('#add-language-template') );
+          $('#add-language-template').children().removeAttr('id').removeAttr('name');
+
           var languageCount = $('li.language').size();
 
           $('#edit-profile-form').on('click', 'button.remove', function (event) {
@@ -87,8 +90,6 @@
           $('button.another').click(function (event) {
               event.preventDefault();
 
-              languageCount++;
-
               var newLanguage = $('<li>').append($('#add-language-template').clone().contents());
               newLanguage.find('select.language_id').attr('name',
                                                           'profile.languages.' + languageCount + '.language_id');
@@ -96,6 +97,8 @@
                                                       'profile.languages.' + languageCount + '.fluency');
 
               $(this).parents('li').before(newLanguage);
+
+              languageCount++;
           });
       });
       //]]></script>