anchor.diff:  
                                       </div>
                                   </a>
  +                                    <label for="icon-<%=iconId%>"><%=Encode.forHtmlContent(idpName)%></label>
  +                                </div>
                                   <%} else { %>
  +                                <div>
                                   <a onclick="javascript: handleNoDomain('<%=Encode.forJavaScriptAttribute(Encode.
                                   forUriComponent(idpName))%>',
                                           '<%=Encode.forJavaScriptAttribute(Encode.forUriComponent(idpEntry.getValue()))%>')"
  -                                   href="#">
  +                                   href="#" id="icon-<%=iconId%>">
                                       <img class="idp-image" src="images/login-icon.png" data-toggle="tooltip"
                                            data-placement="top" title="Sign in with <%=Encode.forHtmlContent(idpName)%>"/>
                                   </a>
  +                                <label for="icon-<%=iconId%>"><%=Encode.forHtmlContent(idpName)%></label>
  +                                    </div>
                                   <%} %>
                                   <%
                                   } else if (localAuthenticatorNames.size() > 0) {
                                       if (localAuthenticatorNames.contains("IWAAuthenticator")) {
                                   %>
  +                                <div>
                                   <a onclick="javascript: handleNoDomain('<%=Encode.forJavaScriptAttribute(Encode.
                                   forUriComponent(idpEntry.getKey()))%>',
  -                                        'IWAAuthenticator')" class="main-link" style="cursor:pointer">
  +                                        'IWAAuthenticator')" class="main-link" style="cursor:pointer" id="icon-<%=iconId%>">
                                       <img class="idp-image" src="images/login-icon.png" data-toggle="tooltip"
                                            data-placement="top" title="Sign in with IWA"/>
                                   </a>
  +                                <label for="icon-<%=iconId%>">IWA</label>
  +                                </div>
                                   <%
                                       }
                                       if (localAuthenticatorNames.contains("FIDOAuthenticator")) {
                                   %>
  +                                <div>
                                   <a onclick="javascript: handleNoDomain('<%=Encode.forJavaScriptAttribute(Encode.
                                   forUriComponent(idpEntry.getKey()))%>',
  -                                        'FIDOAuthenticator')" class="main-link" style="cursor:pointer">
  +                                        'FIDOAuthenticator')" class="main-link" style="cursor:pointer" id="icon-<%=iconId%>">
                                       <img class="idp-image" src="images/login-icon.png" data-toggle="tooltip"
                                            data-placement="top" title="Sign in with FIDO"/>
                                   </a>
  +                                <label for="icon-<%=iconId%>">IWA</label>
  +
  +                                </div>
                                   <%
                                               }
                                           }
  
positive.code:                                             }
                                  %>
                                  <% if (isHubIdp) { %>
                                  <a href="#" data-toggle="popover" data-placement="bottom"
                                     title="Sign in with <%=Encode.forHtmlContent(idpName)%>" id="popover">
                                      <img class="idp-image" src="images/login-icon.png"
                                           title="Sign in with <%=Encode.forHtmlContent(idpName)%>"/>
  
  
negative.code:                             </div>
                              <div class="form-group">
                                  <%
                                      int iconId = 0;
                                      for (Map.Entry<String, String> idpEntry : idpAuthenticatorMapping.entrySet()) {
                                          iconId++;
                                          if (!idpEntry.getKey().equals(Constants.RESIDENT_IDP_RESERVED_NAME)) {
                                              String idpName = idpEntry.getKey();
                                              boolean isHubIdp = false;
  