diff --git a/lib/MusicBrainz/Server/Form/Role/UserProfile.pm b/lib/MusicBrainz/Server/Form/Role/UserProfile.pm
index 6c1f5e206b3..8a61a3df288 100644
--- a/lib/MusicBrainz/Server/Form/Role/UserProfile.pm
+++ b/lib/MusicBrainz/Server/Form/Role/UserProfile.pm
@@ -3,7 +3,7 @@ package MusicBrainz::Server::Form::Role::UserProfile;
 use HTML::FormHandler::Moose::Role;
 use List::MoreUtils qw( any all );
 use MusicBrainz::Server::Form::Utils qw( language_options select_options_tree validate_username );
-use MusicBrainz::Server::Translation qw( l ln );
+use MusicBrainz::Server::Translation qw( l ln N_l );
 use MusicBrainz::Server::Validation qw( is_valid_url );
 
 has_field 'username' => (
@@ -53,11 +53,13 @@ has_field 'languages' => (
 
 has_field 'languages.language_id' => (
     type => 'Select',
+    messages => { required => N_l('A language is required.') },
     required => 1
 );
 
 has_field 'languages.fluency' => (
     type => 'Select',
+    messages => { required => N_l('A fluency level is required.') },
     required => 1
 );
 
diff --git a/root/static/scripts/account/components/EditProfileForm.js b/root/static/scripts/account/components/EditProfileForm.js
index 00950cfa5e7..ad9fa3f6949 100644
--- a/root/static/scripts/account/components/EditProfileForm.js
+++ b/root/static/scripts/account/components/EditProfileForm.js
@@ -280,13 +280,13 @@ class EditProfileForm extends React.Component<Props, State> {
             {field.languages.field.map((languageField, index) => (
               <li className="language" key={index}>
                 <SelectField
-                  allowEmpty={false}
+                  allowEmpty
                   field={languageField.field.language_id}
                   onChange={(e) => this.handleLanguageChange(e, index)}
                   options={this.state.languageOptions}
                 />
                 <SelectField
-                  allowEmpty={false}
+                  allowEmpty
                   field={languageField.field.fluency}
                   onChange={(e) => this.handleFluencyChange(e, index)}
                   options={fluencyOptions}
@@ -300,6 +300,8 @@ class EditProfileForm extends React.Component<Props, State> {
                     {l('Remove')}
                   </button>
                 </span>
+                <FieldErrors field={languageField.field.language_id} />
+                <FieldErrors field={languageField.field.fluency} />
               </li>
             ))}
             <li key="add">