diff --git a/README.md b/README.md
index 48371c531..6cea918aa 100644
--- a/README.md
+++ b/README.md
@@ -22,11 +22,6 @@ Documentation
 * [Database diagram](/doc/models_complete.svg)
 * [Controllers diagram](/doc/controllers_complete.svg)
 
-### Updating documentation
-
-    AUTODOC=true rspec spec/requests
-    EPP_DOC=true rspec spec/epp --tag epp --require support/epp_doc.rb --format EppDoc > doc/epp_examples.md
-
 Installation
 ------------
 
@@ -381,6 +376,8 @@ All registry demo data can be found at:
 
 Initially you can use two type of users: admin users and EPP users.
 
+For using EPP we are strongly recommend to install epp_proxy instead of mod_epp. You can get epp_proxy from https://github.com/internetee/epp_proxy
+
 ### Wkhtmltopdf setup
 
 ```
diff --git a/app/controllers/epp/base_controller.rb b/app/controllers/epp/base_controller.rb
index e3ac81815..99c0ead35 100644
--- a/app/controllers/epp/base_controller.rb
+++ b/app/controllers/epp/base_controller.rb
@@ -343,7 +343,9 @@ module Epp
     end
 
     def epp_session_id
-      cookies[:session] # Passed by mod_epp https://github.com/mod-epp/mod-epp#requestscript-interface
+      # Passed by EPP proxy
+      # https://github.com/internetee/epp_proxy#translation-of-epp-calls
+      cookies[:session]
     end
 
     def ensure_session_id_passed
diff --git a/test/integration/epp/login/credentials_test.rb b/test/integration/epp/login/credentials_test.rb
index a62579766..0f7dac97c 100644
--- a/test/integration/epp/login/credentials_test.rb
+++ b/test/integration/epp/login/credentials_test.rb
@@ -31,7 +31,7 @@ class EppLoginCredentialsTest < EppTestCase
   end
 
   def test_already_logged_in
-    assert true # Handled by mod_epp
+    assert true # Handled by EPP proxy
   end
 
   def test_wrong_credentials