diff --git a/app/controllers/api/v1/registrant/registry_locks_controller.rb b/app/controllers/api/v1/registrant/registry_locks_controller.rb
index a97d1c62b..1efffeb75 100644
--- a/app/controllers/api/v1/registrant/registry_locks_controller.rb
+++ b/app/controllers/api/v1/registrant/registry_locks_controller.rb
@@ -8,9 +8,9 @@ module Api
         before_action :authorized_to_manage_locks?
 
         def create
-          p "============"
+          extensionsProhibited = params[:extensionsProhibited]
 
-          if @domain.apply_registry_lock
+          if @domain.apply_registry_lock(extensionsProhibited: extensionsProhibited.to_s.downcase == "true")
             render json: serialized_domain(@domain)
           else
             render json: { errors: [{ base: ['Domain cannot be locked'] }] },
diff --git a/app/models/concerns/domain/registry_lockable.rb b/app/models/concerns/domain/registry_lockable.rb
index 7ee9860a8..98f1c8917 100644
--- a/app/models/concerns/domain/registry_lockable.rb
+++ b/app/models/concerns/domain/registry_lockable.rb
@@ -11,12 +11,16 @@ module Domain::RegistryLockable
                      DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze
                   end
 
-  def apply_registry_lock
+  EXTENSIONS_STATUS = [DomainStatus::SERVER_EXTENSION_UPDATE_PROHIBITED].freeze
+  
+
+  def apply_registry_lock(extensionsProhibited:)
     return unless registry_lockable?
     return if locked_by_registrant?
 
     transaction do
       self.statuses |= LOCK_STATUSES
+      self.statuses |= EXTENSIONS_STATUS if Feature.obj_and_extensions_statuses_enabled? and extensionsProhibited
       self.locked_by_registrant_at = Time.zone.now
       alert_registrar_lock_changes!(lock: true)
 
@@ -44,6 +48,9 @@ module Domain::RegistryLockable
       LOCK_STATUSES.each do |domain_status|
         statuses.delete([domain_status])
       end
+      
+      statuses.delete([EXTENSIONS_STATUS]) if statuses.include? EXTENSIONS_STATUS
+
       self.locked_by_registrant_at = nil
       self.statuses = admin_store_statuses_history || []
       alert_registrar_lock_changes!(lock: false)
diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb
index c6d80901e..57a2f58ab 100644
--- a/app/models/registrant_user.rb
+++ b/app/models/registrant_user.rb
@@ -17,13 +17,13 @@ class RegistrantUser < User
     Country.new(alpha2_code)
   end
 
-  def companies(company_register = nil)
+  def companies(company_register = CompanyRegister::Client.new)
     return [] if ident.include?('-')
 
-    [OpenStruct.new(registration_number: '43344412', company_name: 'TestFirma'),
-    OpenStruct.new(registration_number: '12345678', company_name: 'SuperFirma OU')]
+    company_register.representation_rights(citizen_personal_code: ident,
+                                           citizen_country_code: country.alpha3)
   end
-
+  
   def contacts(representable: true)
     Contact.registrant_user_contacts(self, representable: representable)
   end
diff --git a/test/integration/api/registrant/registrant_api_registry_locks_test.rb b/test/integration/api/registrant/registrant_api_registry_locks_test.rb
index 0de47dbc9..c119425a2 100644
--- a/test/integration/api/registrant/registrant_api_registry_locks_test.rb
+++ b/test/integration/api/registrant/registrant_api_registry_locks_test.rb
@@ -47,7 +47,7 @@ class RegistrantApiRegistryLocksTest < ApplicationIntegrationTest
   end
 
   def test_cannot_lock_an_already_locked_domain
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     assert(@domain.locked_by_registrant?)
 
     post '/api/v1/registrant/domains/2df2c1a1-8f6a-490a-81be-8bdf29866880/registry_lock',
diff --git a/test/jobs/domain_update_confirm_job_test.rb b/test/jobs/domain_update_confirm_job_test.rb
index 183fd5cf1..54a144424 100644
--- a/test/jobs/domain_update_confirm_job_test.rb
+++ b/test/jobs/domain_update_confirm_job_test.rb
@@ -22,14 +22,14 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase
 
   def test_registrant_locked_domain
     refute @domain.locked_by_registrant?
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     assert @domain.locked_by_registrant?
     assert_equal(@domain.registrar.notifications.last.text, "Domain #{@domain.name} has been locked by registrant")
   end
 
   def test_registrant_unlocked_domain
     refute @domain.locked_by_registrant?
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     assert @domain.locked_by_registrant?
     @domain.remove_registry_lock
     refute @domain.locked_by_registrant?
diff --git a/test/lib/serializers/registrant_api/domain_test.rb b/test/lib/serializers/registrant_api/domain_test.rb
index 2e68e4293..a207b649f 100644
--- a/test/lib/serializers/registrant_api/domain_test.rb
+++ b/test/lib/serializers/registrant_api/domain_test.rb
@@ -16,7 +16,7 @@ class SerializersRegistrantApiDomainTest < ActiveSupport::TestCase
     assert_not(@json[:locked_by_registrant_at])
 
     travel_to Time.zone.parse('2010-07-05 10:30')
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     serializer_for_locked_domain = Serializers::RegistrantApi::Domain.new(@domain.reload)
     new_json = serializer_for_locked_domain.to_json
 
diff --git a/test/models/domain/domain_version_test.rb b/test/models/domain/domain_version_test.rb
index 2139c21c1..109785fcb 100644
--- a/test/models/domain/domain_version_test.rb
+++ b/test/models/domain/domain_version_test.rb
@@ -31,7 +31,7 @@ class DomainVersionTest < ActiveSupport::TestCase
     PaperTrail.request.whodunnit = @user.id_role_username
 
     assert_difference '@domain.versions.count', 1 do
-      @domain.apply_registry_lock
+      @domain.apply_registry_lock(extensionsProhibited: false)
     end
 
     assert_equal(@domain.updator, @user)
diff --git a/test/models/domain/registry_lockable_test.rb b/test/models/domain/registry_lockable_test.rb
index c8ea69fd1..853d44cc5 100644
--- a/test/models/domain/registry_lockable_test.rb
+++ b/test/models/domain/registry_lockable_test.rb
@@ -18,7 +18,7 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase
   end
 
   def test_remove_lockalable_statuses_after_admin_intervention
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     assert @domain.locked_by_registrant?
     assert_equal @domain.statuses.sort, Domain::RegistryLockable::LOCK_STATUSES.sort
 
@@ -26,7 +26,7 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase
     @domain.update(statuses: deleted_status)
     assert_not @domain.locked_by_registrant?
 
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     assert @domain.locked_by_registrant?
     @domain.remove_registry_lock
 
@@ -41,7 +41,7 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase
     @domain.save
     assert @domain.admin_store_statuses_history.include? DomainStatus::SERVER_UPDATE_PROHIBITED
 
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     assert @domain.locked_by_registrant?
     assert_equal @domain.statuses.sort, Domain::RegistryLockable::LOCK_STATUSES.sort
 
@@ -52,7 +52,7 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase
   end
 
   def test_add_additinal_status_for_locked_domain
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     assert @domain.locked_by_registrant?
     assert_equal @domain.statuses.sort, Domain::RegistryLockable::LOCK_STATUSES.sort
 
@@ -69,7 +69,7 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase
 
   def test_lockable_domain_if_remove_some_prohibited_status
     refute(@domain.locked_by_registrant?)
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     check_statuses_lockable_domain
     assert(@domain.locked_by_registrant?)
 
@@ -85,7 +85,7 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase
 
   def test_registry_lock_on_lockable_domain
     refute(@domain.locked_by_registrant?)
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
 
     assert_equal(
       [DomainStatus::SERVER_UPDATE_PROHIBITED,
@@ -99,21 +99,21 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase
   end
 
   def test_registry_lock_cannot_be_applied_twice
-    @domain.apply_registry_lock
-    refute(@domain.apply_registry_lock)
+    @domain.apply_registry_lock(extensionsProhibited: false)
+    refute(@domain.apply_registry_lock(extensionsProhibited: false))
     assert(@domain.locked_by_registrant?)
     assert(@domain.locked_by_registrant_at)
   end
 
   def test_registry_lock_cannot_be_applied_on_pending_statuses
     @domain.statuses << DomainStatus::PENDING_RENEW
-    refute(@domain.apply_registry_lock)
+    refute(@domain.apply_registry_lock(extensionsProhibited: false))
     refute(@domain.locked_by_registrant?)
     refute(@domain.locked_by_registrant_at)
   end
 
   def test_remove_registry_lock_on_locked_domain
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
 
     assert_equal(
       [DomainStatus::SERVER_UPDATE_PROHIBITED,
diff --git a/test/system/admin_area/domains/registry_lock_test.rb b/test/system/admin_area/domains/registry_lock_test.rb
index 6a34c23b4..3d002a077 100644
--- a/test/system/admin_area/domains/registry_lock_test.rb
+++ b/test/system/admin_area/domains/registry_lock_test.rb
@@ -17,7 +17,7 @@ class AdminAreaRegistryLockTest < JavaScriptApplicationSystemTestCase
   end
 
   def test_can_remove_registry_lock_from_a_domain
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
 
     visit edit_admin_domain_path(@domain)
     click_link_or_button('Actions')
@@ -34,7 +34,7 @@ class AdminAreaRegistryLockTest < JavaScriptApplicationSystemTestCase
   end
 
   def test_cannot_remove_registry_lock_from_not_locked_domain
-    @domain.apply_registry_lock
+    @domain.apply_registry_lock(extensionsProhibited: false)
     visit edit_admin_domain_path(@domain)
     @domain.remove_registry_lock
 
diff --git a/test/system/admin_area/domains_test.rb b/test/system/admin_area/domains_test.rb
index 9a59247fe..52babd99c 100644
--- a/test/system/admin_area/domains_test.rb
+++ b/test/system/admin_area/domains_test.rb
@@ -20,7 +20,7 @@ class AdminDomainsTestTest < ApplicationSystemTestCase
     refute_text 'Registry lock time 2010-07-05 00:30'
 
     lockable_domain = domains(:airport)
-    lockable_domain.apply_registry_lock
+    lockable_domain.apply_registry_lock(extensionsProhibited: false)
 
     visit admin_domain_path(lockable_domain)
     assert_text 'Registry lock time 2010-07-05 00:30'