diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a59838ff..a58d3a268 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+16.12.2016
+* Allow contact address processing to be configurable via admin
+* EPP XML schema namespace "urn:ietf:params:xml:ns:epp-1.0" replaced with "https://epp.tld.ee/schema/epp-ee-1.0.xsd"
+* EPP XML schema contact-eis-1.0 replaced with contact-ee-1.1
+
 18.11.2016 
 * Domain expiration emails are now sent out to admin contacts as well. Sending bug is fixed.
 * Include detailed registrar's contact info in emails
diff --git a/Gemfile b/Gemfile
index 83ec9b4a7..11e5d92a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -83,9 +83,8 @@ gem 'deep_cloneable', '2.1.1'
 # id + mid login
 gem 'digidoc_client', '0.2.1'
 
-# epp
-gem 'epp', '1.4.2', github: 'internetee/epp'
-gem 'epp-xml',   '1.0.5', github: 'internetee/epp-xml' # EIS EPP XMLs
+gem 'epp', '1.5.0', github: 'internetee/epp'
+gem 'epp-xml', '1.1.0', github: 'internetee/epp-xml'
 gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem)
 
 # que
diff --git a/Gemfile.lock b/Gemfile.lock
index 31ecaeb02..7b3810caf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,17 +18,17 @@ GIT
 
 GIT
   remote: https://github.com/internetee/epp-xml.git
-  revision: 475f650951f2cf5015e00d48f408a2194ecc1662
+  revision: 5dd542e67ef26d58365f30e553254d6db809277d
   specs:
-    epp-xml (1.0.5)
+    epp-xml (1.1.0)
       activesupport (~> 4.1)
       builder (~> 3.2)
 
 GIT
   remote: https://github.com/internetee/epp.git
-  revision: 505c3f2739eb1da918e54111aecfb138a822739d
+  revision: 1a50f2144f15a2d975337e56fb1ccaba5d956e9d
   specs:
-    epp (1.4.2)
+    epp (1.5.0)
       hpricot
       libxml-ruby
 
@@ -299,7 +299,7 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.11)
-    libxml-ruby (2.8.0)
+    libxml-ruby (2.9.0)
     liquid (3.0.6)
     listen (3.0.3)
       rb-fsevent (>= 0.9.3)
@@ -593,8 +593,8 @@ DEPENDENCIES
   deep_cloneable (= 2.1.1)
   devise (= 3.5.4)
   digidoc_client (= 0.2.1)
-  epp (= 1.4.2)!
-  epp-xml (= 1.0.5)!
+  epp (= 1.5.0)!
+  epp-xml (= 1.1.0)!
   fabrication (= 2.13.2)
   factory_girl_rails
   figaro (= 1.1.1)
diff --git a/app/api/repp/contact_v1.rb b/app/api/repp/contact_v1.rb
index ea7bfdc43..810829ef7 100644
--- a/app/api/repp/contact_v1.rb
+++ b/app/api/repp/contact_v1.rb
@@ -21,8 +21,6 @@ module Repp
             attributes = Contact.attribute_names - Contact.address_attribute_names
             contacts = contacts.select(attributes)
           end
-
-          contacts
         else
           contacts = current_user.registrar.contacts.limit(limit).offset(offset).pluck(:code)
         end
diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb
index 14fd58173..58a314410 100644
--- a/app/controllers/epp/sessions_controller.rb
+++ b/app/controllers/epp/sessions_controller.rb
@@ -27,7 +27,7 @@ class Epp::SessionsController < EppController
       end
     end
 
-    if !Rails.env.development? && !Rails.env.test? && !webclient_request && @api_user
+    if !webclient_request && @api_user
       unless @api_user.api_pki_ok?(request.env['HTTP_SSL_CLIENT_CERT'], request.env['HTTP_SSL_CLIENT_S_DN_CN'])
         epp_errors << {
           msg: 'Authentication error; server closing connection (certificate is not valid)',