diff --git a/js/issuer.js b/js/issuer.js
index 84d998a..119cb68 100644
--- a/js/issuer.js
+++ b/js/issuer.js
@@ -72,6 +72,9 @@ $(function () {
       window.alert("'redirect_uri' must exist and should point to '" + clientParams.redirect_uri + "'");
       console.error("'redirect_uri' must exist and should point to '" + clientParams.redirect_uri + "'");
     }
+    if (clientParams.subject) {
+      console.log('clientParams.subject: ', clientParams.subject);
+    }
     clientParams.referrer = window.document.referrer;
   }
 
@@ -397,6 +400,10 @@ $(function () {
           + '&error_uri=' + encodeURIComponent('https://oauth3.org/docs/errors/#E_IFRAME_DENIED');
         location.href = callbackUrl;
       }
+      if (clientParams.subject) {
+        $('.js-oauth3-email').val(clientParams.subject);
+        $('.js-authn-show').prop('disabled', false);
+      }
       $('.js-userid-container').show();
     }).then(function () {
       //$('body').addClass('in');