diff --git a/app/assets/javascripts/sitewide/avatar_modal.js b/app/assets/javascripts/sitewide/avatar_modal.js
index 74934b286..bb7ac2dd6 100644
--- a/app/assets/javascripts/sitewide/avatar_modal.js
+++ b/app/assets/javascripts/sitewide/avatar_modal.js
@@ -89,7 +89,7 @@ var avatarsModal = (function() {
         initCropTool();
         initPredefinedAvatars();
         initUpdateButton();
-        $('.user-settings-edit-avatar').click(() => {
+        $('.user-settings-edit-avatar img, .user-settings-edit-avatar').click(() => {
           $(modal).modal('show');
         });
       }
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index 27a901219..ea2fac89e 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -72,7 +72,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
       yield resource if block_given?
       if resource_updated
         # Set "needs confirmation" flash if neccesary
-        if is_flashing_format?
+        if is_flashing_format? || account_update_params['change_avatar']
           flash_key = update_needs_confirmation?(resource, prev_unconfirmed_email) ?
             :update_needs_confirmation : :updated
           set_flash_message :notice, flash_key
diff --git a/app/views/users/shared/_user_avatars_modal.html.erb b/app/views/users/shared/_user_avatars_modal.html.erb
index 355d25b1b..d1e73dc4f 100644
--- a/app/views/users/shared/_user_avatars_modal.html.erb
+++ b/app/views/users/shared/_user_avatars_modal.html.erb
@@ -32,7 +32,7 @@
           </div>
         </div>
         <div class="modal-footer">
-          <div class="btn btn-primary save-button disabled"><%= t('general.save') %></div>
+          <button type="button" class="btn btn-primary save-button disabled"><%= t('general.save') %></button>
         </div>
       </div>
     </div>
diff --git a/features/settings_page/profile.feature b/features/settings_page/profile.feature
index bd357ac1f..74ebb3802 100644
--- a/features/settings_page/profile.feature
+++ b/features/settings_page/profile.feature
@@ -18,20 +18,12 @@ Background:
    And I click "Settings" link within "#user-account-dropdown"
    Then I should see "My profile"
 
-@javascript
-Scenario: Unsuccessful avatar image upload, file is too big
-  Given I'm on the profile page
-  Then I click on image within ".avatar-container" element
-  And I attach a "Moon.png" file to "#user_raw_avatar" field
-  And I trigger click '#user-avatar-field .btn-success'
-  And I should see "Your avatar file cannot be larger than 0.2 MB. (Please try again with a smaller file.)" error message
-
 @javascript
 Scenario: Successful upload avatar image
   Given I'm on the profile page
   Then I click on image within ".avatar-container" element
-  And I attach a "Star.png" file to "#user_raw_avatar" field
-  Then I click "Upload" button
+  And I attach a "Star.png" file to "#raw_avatar" field
+  Then I click "Save" button
   And I should see "Your account has been updated successfully" flash message
 
 @javascript
diff --git a/features/step_definitions/shared_steps.rb b/features/step_definitions/shared_steps.rb
index 4c500532a..d0547a63b 100644
--- a/features/step_definitions/shared_steps.rb
+++ b/features/step_definitions/shared_steps.rb
@@ -69,7 +69,7 @@ end
 
 Then(/^I attach a "([^"]*)" file to "([^"]*)" field$/) do |file, field_id|
   wait_for_ajax
-  find(field_id).attach_file(Rails.root.join('features', 'assets', file))
+  find(field_id, :visible => false).attach_file(Rails.root.join('features', 'assets', file))
   # "expensive" operation needs some time :=)
   sleep(0.5)
 end