diff --git a/java/google/registry/ui/js/registrar/console.js b/java/google/registry/ui/js/registrar/console.js
index d0d8e27ac..a4fde4b0f 100644
--- a/java/google/registry/ui/js/registrar/console.js
+++ b/java/google/registry/ui/js/registrar/console.js
@@ -47,10 +47,15 @@ goog.forwardDeclare('registry.Component');
  * @final
  */
 registry.registrar.Console = function(params) {
+  /**
+   * @type {!Object}
+   */
+  // We have to define this before creating an EppSession because EppSession's
+  // constructor expects us to have it as an attribute.
+  this.params = params;
+
   registry.registrar.Console.base(
-      this, 'constructor',
-      new registry.registrar.EppSession(this, params.xsrfToken,
-                                        params.clientId));
+      this, 'constructor', new registry.registrar.EppSession(this));
 
   /**
    * Component that's currently embedded in the page.
@@ -63,11 +68,6 @@ registry.registrar.Console = function(params) {
   //      ready here.
   this.history.setEnabled(true);
 
-  /**
-   * @type {!Object}
-   */
-  this.params = params;
-
   /**
    * Last active nav element.
    * @type {Element}
diff --git a/java/google/registry/ui/js/registrar/epp_session.js b/java/google/registry/ui/js/registrar/epp_session.js
index ef9afe55f..58ec9d1de 100644
--- a/java/google/registry/ui/js/registrar/epp_session.js
+++ b/java/google/registry/ui/js/registrar/epp_session.js
@@ -27,15 +27,14 @@ goog.forwardDeclare('registry.registrar.Console');
 /**
  * Session state for console.
  * @param {!registry.registrar.Console} console
- * @param {string} xsrfToken Populated by server-side soy template.
- * @param {string} clientId The logged in GAE user.
  * @constructor
  * @extends {registry.Session}
  * @final
  */
-registry.registrar.EppSession = function(console, xsrfToken, clientId) {
+registry.registrar.EppSession = function(console) {
   registry.registrar.EppSession.base(
-      this, 'constructor', new goog.Uri('/registrar-xhr'), xsrfToken,
+      this, 'constructor', new goog.Uri('/registrar-xhr'),
+      console.params.xsrfToken,
       registry.Session.ContentType.EPP);
 
   /**
@@ -48,12 +47,6 @@ registry.registrar.EppSession = function(console, xsrfToken, clientId) {
    * @private
    */
   this.isEppLoggedIn_ = false;
-
-  /**
-   * @type {string}
-   * @private
-   */
-  this.clientId_ = clientId;
 };
 goog.inherits(registry.registrar.EppSession, registry.Session);
 
@@ -74,7 +67,7 @@ registry.registrar.EppSession.prototype.isEppLoggedIn = function() {
  * @return {string} the clientId.
  */
 registry.registrar.EppSession.prototype.getClientId = function() {
-  return this.clientId_;
+  return this.console.params.clientId;
 };
 
 
@@ -83,7 +76,7 @@ registry.registrar.EppSession.prototype.getClientId = function() {
  * @param {function()} successCb to be called on success.
  */
 registry.registrar.EppSession.prototype.login = function(successCb) {
-  var eppArgs = {clId: this.clientId_, clTrid: 'asdf-1235'};
+  var eppArgs = {clId: this.console.params.clientId, clTrid: 'asdf-1235'};
   this.send(
       registry.soy.registrar.epp.login(eppArgs).getContent(),
       goog.bind(function(xml) {
diff --git a/javatests/google/registry/ui/js/registrar/console_test_util.js b/javatests/google/registry/ui/js/registrar/console_test_util.js
index b2a07ea24..eb269d620 100644
--- a/javatests/google/registry/ui/js/registrar/console_test_util.js
+++ b/javatests/google/registry/ui/js/registrar/console_test_util.js
@@ -40,9 +40,7 @@ registry.registrar.ConsoleTestUtil.setup = function(test) {
   /** @suppress {missingRequire} */
   test.mockControl
       .createConstructorMock(registry.registrar, 'EppSession')(
-          goog.testing.mockmatchers.isObject,
-          goog.testing.mockmatchers.isString,
-          goog.testing.mockmatchers.isString)
+          goog.testing.mockmatchers.isObject)
       .$returns(test.sessionMock);
 };