diff --git a/templates/web/select_sp.tt2.html b/templates/web/select_sp.tt2.html
index 394051ed187bdec4b2840e7455ca89563aadfe76..ad27e9c02d23f3f57c3664a900bcdbedbadfc96f 100644
--- a/templates/web/select_sp.tt2.html
+++ b/templates/web/select_sp.tt2.html
@@ -40,3 +40,11 @@ administrator to add ContactPerson information to the SAML metadata.
 
 </fieldset>
 
+<script type="text/javascript">
+    $(function() {
+       $('label[for="email_address"]').on('click', function() {
+          var input = $(this).prev();
+          input.val([input.attr('value')]);
+       });
+    });
+</script>
\ No newline at end of file
diff --git a/templates/web/validate_token.tt2.html b/templates/web/validate_token.tt2.html
index a89d55b8b03a3d6fd854266391386ac40c85b334..b3641ee4e1b72bdd55da9a87b05675a28c5a63b7 100644
--- a/templates/web/validate_token.tt2.html
+++ b/templates/web/validate_token.tt2.html
@@ -13,7 +13,7 @@ jQuery(document).ready(function($){
             }
         }
     });
-    $( ".show_account_details" ).click(function(e) {
+    $( ".show_account_details" ).on('click', function(e) {
         var id = $(this).attr('id').substr(5);
         $("#" + id).dialog( "open" );
         e.stopPropagation();