diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index e4808e047..5078d4de5 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -2,7 +2,6 @@ class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 
   def strip_whitespaces
-    self.service_name = service_name.strip unless !respond_to?("service_name") || service_name.nil?
-    self.name = name.strip unless !respond_to?("name") || name.nil?
+    fields_to_strip.each { |field| self[field] = self[field].strip if field.present? }
   end
 end
diff --git a/app/models/location.rb b/app/models/location.rb
index 2958f616e..3a9069e56 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -8,6 +8,10 @@ class Location < ApplicationRecord
   before_save :lookup_postcode!, if: :postcode_changed?
   before_validation :strip_whitespaces
 
+  def fields_to_strip
+    %w[name]
+  end
+
   attr_accessor :add_another_location
 
   scope :search_by_postcode, ->(postcode) { where("REPLACE(postcode, ' ', '') ILIKE ?", "%#{postcode.delete(' ')}%") }
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 477ae940b..a7f803688 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -13,6 +13,11 @@ class Organisation < ApplicationRecord
   has_paper_trail
 
   before_validation :strip_whitespaces
+
+  def fields_to_strip
+    %w[name]
+  end
+  
   PROVIDER_TYPE = {
     LA: 1,
     PRP: 2,
diff --git a/app/models/scheme.rb b/app/models/scheme.rb
index 73b3b5106..807627a76 100644
--- a/app/models/scheme.rb
+++ b/app/models/scheme.rb
@@ -21,6 +21,10 @@ class Scheme < ApplicationRecord
 
   before_validation :strip_whitespaces
 
+  def fields_to_strip
+    %w[service_name]
+  end
+
   SENSITIVE = {
     No: 0,
     Yes: 1,
diff --git a/app/models/user.rb b/app/models/user.rb
index 0d08dc533..1d92b10f5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -29,6 +29,10 @@ class User < ApplicationRecord
 
   before_validation :strip_whitespaces
 
+  def fields_to_strip
+    %w[name]
+  end
+
   ROLES = {
     data_provider: 1,
     data_coordinator: 2,