diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 5097657298..d654b02432 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -1,7 +1,6 @@
 class Projects::ProjectMembersController < Projects::ApplicationController
   # Authorize
   before_filter :authorize_admin_project!, except: :leave
-  before_filter :check_membership_lock, only: [:create, :update, :destroy]
 
   layout "project_settings"
 
@@ -104,10 +103,4 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     AuditEventService.new(current_user, @project, options).
       for_member(member).security_event
   end
-
-  def check_membership_lock
-    if @project.group && @project.group.membership_lock
-      return access_denied!
-    end
-  end
 end
diff --git a/app/views/projects/project_members/_project_member.html.haml b/app/views/projects/project_members/_project_member.html.haml
index b987f21614..1f31d84dd1 100644
--- a/app/views/projects/project_members/_project_member.html.haml
+++ b/app/views/projects/project_members/_project_member.html.haml
@@ -12,7 +12,7 @@
       %label.label.label-danger
         %strong Blocked
 
-  - if current_user_can_admin_project && !membership_locked?
+  - if current_user_can_admin_project
     - unless @project.personal? && user == current_user
       .pull-right
         %strong= member.human_access
diff --git a/features/steps/groups_management.rb b/features/steps/groups_management.rb
index b1b052e40a..31ef91e953 100644
--- a/features/steps/groups_management.rb
+++ b/features/steps/groups_management.rb
@@ -31,7 +31,7 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
   step 'I can control user membership' do
     page.should have_button 'Add members'
     page.should have_link 'Import members'
-    page.should have_selector '#project_member_access_level', text: 'Master'
+    page.should have_selector '#project_member_access_level'
   end
 
   step 'I reload "Open" project members page' do
@@ -60,6 +60,6 @@ class Spinach::Features::GroupsManagement < Spinach::FeatureSteps
   step 'I cannot control user membership from project page' do
     page.should_not have_button 'Add members'
     page.should_not have_link 'Import members'
-    page.should have_selector '#project_member_access_level', text: 'Master'
+    page.should have_selector '#project_member_access_level'
   end
 end
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index 47f09a5f58..7421c91e07 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -132,8 +132,12 @@ class Spinach::Features::Project < Spinach::FeatureSteps
 
   step 'I change "Pete" access level to master' do
     user = User.find_by(name: "Pete")
-    within "#user_#{user.id}" do
+    project_member = @project.project_members.find_by(user_id: user)
+
+    within "#project_member_#{project_member.id}" do
+      click_button "Edit access level"
       select "Master", from: "project_member_access_level"
+      click_button "Save"
     end
 
     sleep 0.05