diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index 9fcbf788303..081f6cea01f 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -22,7 +22,7 @@
                     <div id="builtinColumn" class="col-md-5" style="margin-top:3em;">
                         <h:form id="loginForm" styleClass="form-horizontal">
                             <p:focus context="loginForm"/>
-                            <div class="form-group">
+                            <div class="form-group" style="visibility: hidden">
                                 <p:outputLabel value="Login System" for="loginSystemSelect" styleClass="col-sm-2 control-label"/>
                                 <h:selectOneMenu id="loginSystemSelect" value="#{LoginPage.credentialsAuthProviderId}">
                                     <f:selectItems value="#{LoginPage.listCredentialsAuthenticationProviders()}" var="ap" 
@@ -50,7 +50,7 @@
                         </h:form>
                     </div>
                     <div class="col-md-7" style="margin-top:3em;">
-                        <iframe src="shib-identity-picker.html" width="550" height="400"/>
+                        <iframe src="shib-identity-picker.html" width="450" height="320" style="background-color: lightgray"/>
                     </div>
                 </div>
                 <div style="float: bottom">
diff --git a/src/main/webapp/resources/css/shib-identity-picker.css b/src/main/webapp/resources/css/shib-identity-picker.css
index 3752fd26865..d9049f62924 100644
--- a/src/main/webapp/resources/css/shib-identity-picker.css
+++ b/src/main/webapp/resources/css/shib-identity-picker.css
@@ -3,8 +3,8 @@
 {
     width: 389px;
     text-align: left;
-    background-color: #FFFFFF;
-    border: 2px #A40000 solid;
+    background-color: lightgray;
+    border: 0px #A40000 solid;
     padding: 10px;
 }
 
@@ -46,6 +46,7 @@ div.IdPSelectPreferredIdPButton a
 div.IdPSelectTextDiv{
     height: 3.5ex; /* Add some height to separate the text from the boxes */
     font-size: 15px;
+    clear: left;
 }
 
 div.IdPSelectPreferredIdPImg
diff --git a/src/main/webapp/resources/dev/sample-shib-identities.json b/src/main/webapp/resources/dev/sample-shib-identities.json
new file mode 100644
index 00000000000..50a96fd5a8c
--- /dev/null
+++ b/src/main/webapp/resources/dev/sample-shib-identities.json
@@ -0,0 +1,39 @@
+[
+    {
+        "entityID": "https://idp.testshib.org/idp/shibboleth",
+        "DisplayNames": [
+            {
+                "value": "TestShib Test IdP",
+                "lang": "en"
+            }
+        ],
+        "Descriptions": [
+            {
+                "value": "TestShib IdP. Use this as a source of attributes\n                        for your test SP.",
+                "lang": "en"
+            }
+        ],
+        "Logos": [
+            {
+                "value": "http://testshib.org/images/testshib-transp.png",
+                "height": "75",
+                "width": "88"
+            }
+        ]
+    }, {
+        "entityID": "https://stage.fed.huit.harvard.edu/idp/shibboleth",
+        "DisplayNames": [
+            {
+                "value": "Harvard Test IdP",
+                "lang": "en"
+            }
+        ],
+        "Logos": [
+            {
+                "value": "https://www.iq.harvard.edu/profiles/openscholar/themes/hwpi_basetheme/images/harvard-logo.png",
+                "height": "88",
+                "width": "253"
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/shib/idpselect.js b/src/main/webapp/resources/js/shib/idpselect.js
index 2bd505e5ed5..392ce16d418 100644
--- a/src/main/webapp/resources/js/shib/idpselect.js
+++ b/src/main/webapp/resources/js/shib/idpselect.js
@@ -1 +1,2215 @@
-var JSON;if(!JSON){JSON={}}(function(){function f(n){return n<10?"0"+n:n}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(key){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(key){return this.valueOf()}}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;function quote(string){escapable.lastIndex=0;return escapable.test(string)?'"'+string.replace(escapable,function(a){var c=meta[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+string+'"'}function str(key,holder){var i,k,v,length,mind=gap,partial,value=holder[key];if(value&&typeof value==="object"&&typeof value.toJSON==="function"){value=value.toJSON(key)}if(typeof rep==="function"){value=rep.call(holder,key,value)}switch(typeof value){case"string":return quote(value);case"number":return isFinite(value)?String(value):"null";case"boolean":case"null":return String(value);case"object":if(!value){return"null"}gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==="[object Array]"){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||"null"}v=partial.length===0?"[]":gap?"[\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"]":"["+partial.join(",")+"]";gap=mind;return v}if(rep&&typeof rep==="object"){length=rep.length;for(i=0;i<length;i+=1){if(typeof rep[i]==="string"){k=rep[i];v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}else{for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}v=partial.length===0?"{}":gap?"{\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"}":"{"+partial.join(",")+"}";gap=mind;return v}}if(typeof JSON.stringify!=="function"){JSON.stringify=function(value,replacer,space){var i;gap="";indent="";if(typeof space==="number"){for(i=0;i<space;i+=1){indent+=" "}}else{if(typeof space==="string"){indent=space}}rep=replacer;if(replacer&&typeof replacer!=="function"&&(typeof replacer!=="object"||typeof replacer.length!=="number")){throw new Error("JSON.stringify")}return str("",{"":value})}}if(typeof JSON.parse!=="function"){JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")}}}());function TypeAheadControl(l,f,j,g,i,b,h,e,a,c,d,k){this.elementList=l;this.textBox=f;this.origin=j;this.submit=g;this.results=0;this.alwaysShow=c;this.maxResults=d;this.ie6hack=a;this.maxchars=i;this.getName=b;this.getEntityId=h;this.geticon=e;this.getKeywords=k}TypeAheadControl.prototype.draw=function(){var a=this;this.dropDown=document.createElement("div");this.dropDown.className="IdPSelectDropDown";this.dropDown.style.visibility="hidden";this.dropDown.style.width=this.textBox.offsetWidth;this.dropDown.current=-1;document.body.appendChild(this.dropDown);this.dropDown.onmouseover=function(b){if(!b){b=window.event}var c;if(b.target){c=b.target}if(typeof c=="undefined"){c=b.srcElement}a.select(c)};this.dropDown.onmousedown=function(b){if(-1!=a.dropDown.current){a.textBox.value=a.results[a.dropDown.current][0]}};this.textBox.onkeyup=function(b){if(!b){b=window.event}a.handleKeyUp(b)};this.textBox.onkeydown=function(b){if(!b){b=window.event}a.handleKeyDown(b)};this.textBox.onblur=function(){a.hideDrop()};this.textBox.onfocus=function(){a.handleChange()};this.textBox.focus()};TypeAheadControl.prototype.getPossible=function(b){var h=[];var j=0;var f=0;var e=0;var g;var i;b=b.toLowerCase();while(f<=this.maxResults&&j<this.elementList.length){var a=false;var c=this.getName(this.elementList[j]);if(c.toLowerCase().indexOf(b)!=-1){a=true}if(!a&&this.getEntityId(this.elementList[j]).toLowerCase().indexOf(b)!=-1){a=true}if(!a){var d=this.getKeywords(this.elementList[j]);if(null!=d&&d.toLowerCase().indexOf(b)!=-1){a=true}}if(a){h[f]=[c,this.getEntityId(this.elementList[j]),this.geticon(this.elementList[j])];f++}j++}this.dropDown.current=-1;return h};TypeAheadControl.prototype.handleKeyUp=function(b){var a=b.keyCode;if(27==a){this.textBox.value="";this.handleChange()}else{if(8==a||32==a||(a>=46&&a<112)||a>123){this.handleChange()}}};TypeAheadControl.prototype.handleKeyDown=function(b){var a=b.keyCode;if(38==a){this.upSelect()}else{if(40==a){this.downSelect()}}};TypeAheadControl.prototype.hideDrop=function(){var a=0;if(null!==this.ie6hack){while(a<this.ie6hack.length){this.ie6hack[a].style.visibility="visible";a++}}this.dropDown.style.visibility="hidden";if(-1==this.dropDown.current){this.doUnselected()}};TypeAheadControl.prototype.showDrop=function(){var a=0;if(null!==this.ie6hack){while(a<this.ie6hack.length){this.ie6hack[a].style.visibility="hidden";a++}}this.dropDown.style.visibility="visible"};TypeAheadControl.prototype.doSelected=function(){this.submit.disabled=false};TypeAheadControl.prototype.doUnselected=function(){this.submit.disabled=true};TypeAheadControl.prototype.handleChange=function(){var b=this.textBox.value;var a=this.getPossible(b);if(0===b.length||0===a.length||(!this.alwaysShow&&this.maxResults<a.length)){this.hideDrop();this.doUnselected();this.results=[];this.dropDown.current=-1}else{this.results=a;this.populateDropDown(a);if(1==a.length){this.select(this.dropDown.childNodes[0]);this.doSelected()}else{this.doUnselected()}}};TypeAheadControl.prototype.populateDropDown=function(c){this.dropDown.innerHTML="";var b=0;var f;var a;var e;while(b<c.length){f=document.createElement("div");e=c[b][0];if(null!==c[b][2]){a=document.createElement("img");a.src=c[b][2];a.width=16;a.height=16;a.alt="";f.appendChild(a);if(e.length>this.maxchars-2){e=e.substring(0,this.maxchars-2)}e=" "+e}else{if(e.length>this.maxchars){e=e.substring(0,this.maxchars)}}f.appendChild(document.createTextNode(e));this.dropDown.appendChild(f);b++}var d=this.getXY();this.dropDown.style.left=d[0]+"px";this.dropDown.style.top=d[1]+"px";this.showDrop()};TypeAheadControl.prototype.getXY=function(){var a=this.textBox;var c=0;var b=a.offsetHeight;while(a.tagName!="BODY"){c+=a.offsetLeft;b+=a.offsetTop;a=a.offsetParent}c+=a.offsetLeft;b+=a.offsetTop;return[c,b]};TypeAheadControl.prototype.select=function(b){var a=0;var c;this.dropDown.current=-1;this.doUnselected();while(a<this.dropDown.childNodes.length){c=this.dropDown.childNodes[a];if(c==b){c.className="IdPSelectCurrent";this.doSelected();this.dropDown.current=a;this.origin.value=this.results[a][1];this.origin.textValue=this.results[a][0]}else{c.className=""}a++}this.textBox.focus()};TypeAheadControl.prototype.downSelect=function(){if(this.results.length>0){if(-1==this.dropDown.current){this.dropDown.current=0;this.dropDown.childNodes[0].className="IdPSelectCurrent";this.doSelected();this.origin.value=this.results[0][1];this.origin.textValue=this.results[0][0]}else{if(this.dropDown.current<(this.results.length-1)){this.dropDown.childNodes[this.dropDown.current].className="";this.dropDown.current++;this.dropDown.childNodes[this.dropDown.current].className="IdPSelectCurrent";this.doSelected();this.origin.value=this.results[this.dropDown.current][1];this.origin.textValue=this.results[this.dropDown.current][0]}}}};TypeAheadControl.prototype.upSelect=function(){if((this.results.length>0)&&(this.dropDown.current>0)){this.dropDown.childNodes[this.dropDown.current].className="";this.dropDown.current--;this.dropDown.childNodes[this.dropDown.current].className="IdPSelectCurrent";this.doSelected();this.origin.value=this.results[this.dropDown.current][1];this.origin.textValue=this.results[this.dropDown.current][0]}};function IdPSelectUI(){var n;var N="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";var aw;var K;var an;var aa;var Q;var c;var z;var k;var u;var h;var ai;var e;var p;var R;var y;var U;var J;var f;var D;var af;var G;var Y;var aj;var ad;var I;var L;var g;var ak;var M;var ax="idpSelect";var W="IdPSelect";var ae;var x="";var P="";var am=[];var at="entityID";this.draw=function(az){if(!j(az)){return}aw=document.getElementById(az.insertAtDiv);if(!aw){H(w("fatal.divMissing"));return}if(!d(az.dataSource)){return}q(az.hiddenIdPs);n.sort(function(aB,aA){return aq(aB).localeCompare(aq(aA))});var ay=S();aw.appendChild(ay);ae.draw()};var j=function(ay){var aI;y=ay.preferredIdP;U=ay.maxPreferredIdPs;J=ay.helpURL;f=ay.ie6Hack;D=ay.samlIdPCookieTTL;Y=ay.alwaysShow;aj=ay.maxResults;ad=ay.ignoreKeywords;z=ay.defaultLogo;k=ay.defaultLogoWidth;u=ay.defaultLogoHeight;h=ay.minWidth;ai=ay.minHeight;e=ay.maxWidth;p=ay.maxHeight;R=ay.bestRatio;G=ay.maxIdPCharsButton;af=ay.maxIdPCharsDropDown;if(typeof navigator=="undefined"){K=ay.defaultLanguage}else{K=navigator.language||navigator.userLanguage||ay.defaultLanguage}if(K.indexOf("-")>0){an=K.substring(0,K.indexOf("-"))}aa=ay.defaultLanguage;if(typeof ay.langBundles[K]!="undefined"){Q=ay.langBundles[K]}else{if(typeof an!="undefined"&&typeof ay.langBundles[an]!="undefined"){Q=ay.langBundles[an]}}c=ay.langBundles[ay.defaultLanguage];if(!c){H("No languages work");return false}if(!Q){o("No language support for "+K);Q=c}if(ay.testGUI){return true}var aE="urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single";var aA;var az=false;var aG;var aF;var aC=window;while(null!==aC.parent&&aC!==aC.parent){aC=aC.parent}var aB=aC.location;var aD=aB.search;if(null==aD||0==aD.length||aD.charAt(0)!="?"){if(null==ay.defaultReturn){H(w("fatal.noparms"));return false}aI=ay.myEntityID;x=ay.defaultReturn;if(null!=ay.defaultReturnIDParam){at=ay.defaultReturnIDParam}}else{aD=aD.substring(1);aG=aD.split("&");if(aG.length===0){H(w("fatal.noparms"));return false}for(aA=0;aA<aG.length;aA++){aF=aG[aA].split("=");if(aF.length!=2){continue}if(aF[0]=="entityID"){aI=decodeURIComponent(aF[1])}else{if(aF[0]=="return"){x=decodeURIComponent(aF[1])}else{if(aF[0]=="returnIDParam"){at=decodeURIComponent(aF[1])}else{if(aF[0]=="policy"){aE=decodeURIComponent(aF[1])}else{if(aF[0]=="isPassive"){az=(aF[1].toUpperCase()=="TRUE")}}}}}}}if(aE!="urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single"){H(w("fatal.wrongProtocol"));return false}if(ay.myEntityID!==null&&ay.myEntityID!=aI){H(w("fatal.wrongEntityId")+'"'+aI+'" != "'+ay.myEntityID+'"');return false}if(null===x||x.length===0){H(w("fatal.noReturnURL"));return false}if(!ab(x)){H(w("fatal.badProtocol"));return false}if(az){var aJ=b();if(aJ.length==0){location.href=x;return false}else{var aH=at+"="+encodeURIComponent(aJ[0]);if(x.indexOf("?")==-1){aH="?"+aH}else{aH="&"+aH}location.href=x+aH;return false}}aA=x.indexOf("?");if(aA<0){P=x;return true}P=x.substring(0,aA);aD=x.substring(aA+1);aG=aD.split("&");for(aA=0;aA<aG.length;aA++){aF=aG[aA].split("=");if(aF.length!=2){continue}aF[1]=decodeURIComponent(aF[1]);am.push(aF)}return true};var q=function(aA){if(null==aA||0==aA.length){return}var az;var ay;for(az=0;az<aA.length;az++){for(ay=0;ay<n.length;ay++){if(v(n[ay])==aA[az]){n.splice(ay,1);break}}}};var ab=function(az){if(null===az){return false}var ay="://";var aA=az.indexOf(ay);if(aA<0){return false}az=az.substring(0,aA);if(az=="http"||az=="https"){return true}return false};var av=function(){if(null==navigator){return false}var ay=navigator.appName;if(null==ay){return false}return(ay=="Microsoft Internet Explorer")};var d=function(aB){var aA=null;try{aA=new XMLHttpRequest()}catch(az){}if(null==aA){try{aA=new ActiveXObject("Microsoft.XMLHTTP")}catch(az){}}if(null==aA){try{aA=new ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(az){}}if(null==aA){H(w("fatal.noXMLHttpRequest"));return false}if(av()){aB+="?random="+(Math.random()*1000000)}aA.open("GET",aB,false);if(typeof aA.overrideMimeType=="function"){aA.overrideMimeType("application/json")}aA.send(null);if(aA.status==200){var ay=aA.responseText;if(ay===null){H(w("fatal.noData"));return false}n=JSON.parse(ay)}else{H(w("fatal.loadFailed")+aB);return false}return true};var T=function(ay){for(var az=0;az<n.length;az++){if(v(n[az])==ay){return n[az]}}return null};var A=function(aD){var aC=function(aG){var aE=null;var aF;if(null==aD.Logos){return null}for(aF in aD.Logos){if(aD.Logos[aF].lang==aG&&aD.Logos[aF].width!=null&&aD.Logos[aF].width>=h&&aD.Logos[aF].height!=null&&aD.Logos[aF].height>=ai){if(aE===null){aE=aD.Logos[aF]}else{me=Math.abs(R-Math.log(aD.Logos[aF].width/aD.Logos[aF].height));him=Math.abs(R-Math.log(aE.width/aE.height));if(him>me){aE=aD.Logos[aF]}}}}return aE};var aA=null;var az=document.createElement("img");aA=aC(K);if(null===aA&&typeof an!="undefined"){aA=aC(an)}if(null===aA){aA=aC(null)}if(null===aA){aA=aC(aa)}if(null===aA){az.src=z;az.width=k;az.height=u;az.alt=w("defaultLogoAlt");return az}az.src=aA.value;az.alt=aq(aD);var ay=aA.width;var aB=aA.height;if(ay>e){aB=(e/ay)*aB;ay=e}if(aB>p){ay=(p/aB)*ay;ay=p}az.setAttribute("width",ay);az.setAttribute("height",aB);return az};var S=function(){var az=ac("IdPSelector");var ay;ay=ao(az);l(az,ay);O(az,ay);return az};var E=function(az,aG){var ay=ac(undefined,"PreferredIdPButton");var aF=document.createElement("a");var aE=at+"="+encodeURIComponent(v(az));var aA=x;var aC=A(az);if(aA.indexOf("?")==-1){aE="?"+aE}else{aE="&"+aE}aF.href=aA+aE;aF.onclick=function(){au(v(az))};var aH=ac(undefined,"PreferredIdPImg");aH.appendChild(aC);aF.appendChild(aH);var aD=ac(undefined,"TextDiv");var aB=aq(az);ay.title=aB;if(aB.length>G){aB=aB.substring(0,G)+"..."}aD.appendChild(document.createTextNode(aB));aF.appendChild(aD);ay.appendChild(aF);return ay};var ar=function(ay,aB){var aA=ac(undefined,"TextDiv");var az=document.createTextNode(w(aB));aA.appendChild(az);ay.appendChild(aA)};var a=function(ay,aA){if(null===aA||0===aA.length||"-"==aA.value){return}var az=0;while(az<ay.options.length){if(ay.options[az].value==aA){ay.options[az].selected=true;break}az++}};var ao=function(aC){var aB=F();if(0===aB.length){return false}var aA=ac("PreferredIdPTile");ar(aA,"idpPreferred.label");for(var az=0;az<U&&az<aB.length;az++){if(aB[az]){var ay=E(aB[az],az);aA.appendChild(ay)}}aC.appendChild(aA);return true};var V=function(){var az=document.createElement("form");L.appendChild(az);az.action=P;az.method="GET";az.setAttribute("autocomplete","OFF");var ay=0;for(ay=0;ay<am.length;ay++){var aA=document.createElement("input");aA.setAttribute("type","hidden");aA.name=am[ay][0];aA.value=am[ay][1];az.appendChild(aA)}return az};var l=function(aE,az){L=ac("IdPEntryTile");if(az){ar(L,"idpEntry.label")}else{ar(L,"idpEntry.NoPreferred.label")}var aC=V();var aB=document.createElement("input");aC.appendChild(aB);aB.type="text";i(aB,"Input");var aD=document.createElement("input");aD.setAttribute("type","hidden");aC.appendChild(aD);aD.name=at;aD.value="-";var aA=r("Select");aA.disabled=true;aC.appendChild(aA);aC.onsubmit=function(){if(null===aD.value||0===aD.value.length||"-"==aD.value){return false}aB.value=aD.textValue;au(aD.value);return true};ae=new TypeAheadControl(n,aB,aD,aA,af,aq,v,X,f,Y,aj,B);var ay=document.createElement("a");ay.appendChild(document.createTextNode(w("idpList.showList")));ay.href="#";Z(ay,"DropDownToggle");ay.onclick=function(){L.style.display="none";a(ak,aD.value);g.style.display="inline";M.focus()};L.appendChild(ay);t(L);aE.appendChild(L)};var O=function(aF,aA){g=ac("IdPListTile");g.style.display="none";if(aA){ar(g,"idpList.label")}else{ar(g,"idpList.NoPreferred.label")}ak=document.createElement("select");i(ak,"Selector");ak.name=at;g.appendChild(ak);var az=m("-",w("idpList.defaultOptionLabel"));az.selected=true;ak.appendChild(az);var aE;for(var aC=0;aC<n.length;aC++){aE=n[aC];az=m(v(aE),aq(aE));ak.appendChild(az)}var aD=V();aD.appendChild(ak);aD.onsubmit=function(){if(ak.selectedIndex<1){return false}au(ak.options[ak.selectedIndex].value);return true};var aB=r("List");M=aB;aD.appendChild(aB);g.appendChild(aD);var ay=document.createElement("a");ay.appendChild(document.createTextNode(w("idpList.showSearch")));ay.href="#";Z(ay,"DropDownToggle");ay.onclick=function(){L.style.display="inline";g.style.display="none"};g.appendChild(ay);t(g);aF.appendChild(g)};var r=function(az){var ay=document.createElement("input");ay.setAttribute("type","submit");ay.value=w("submitButton.label");i(ay,az+"Button");return ay};var t=function(az){var ay=document.createElement("a");ay.href=J;ay.appendChild(document.createTextNode(w("helpText")));Z(ay,"HelpButton");az.appendChild(ay)};var ac=function(aA,ay){var az=document.createElement("div");if(undefined!==aA){i(az,aA)}if(undefined!==ay){Z(az,ay)}return az};var m=function(az,aA){var ay=document.createElement("option");ay.value=az;if(aA.length>af){aA=aA.substring(0,af)}ay.appendChild(document.createTextNode(aA));return ay};var i=function(az,ay){az.id=ax+ay};var Z=function(az,ay){az.setAttribute("class",W+ay)};var ap=function(ay){return document.getElementById(ax+ay)};var au=function(ay){C(ay);ag(I)};var w=function(ay){var az=Q[ay];if(!az){az=c[ay]}if(!az){az="Missing message for "+ay}return az};var v=function(ay){return ay.entityID};var X=function(aA){var ay;if(null==aA.Logos){return null}for(ay=0;ay<aA.Logos.length;ay++){var az=aA.Logos[ay];if(az.height=="16"&&az.width=="16"){if(null==az.lang||K==az.lang||(typeof an!="undefined"&&an==az.lang)||aa==az.lang){return az.value}}}return null};var aq=function(az){var ay=al(az.DisplayNames);if(null!==ay){return ay}o("No Name entry in any language for "+v(az));return v(az)};var B=function(az){if(ad||null==az.Keywords){return null}var ay=al(az.Keywords);return ay};var al=function(ay){var az;for(az in ay){if(ay[az].lang==K){return ay[az].value}}if(typeof an!="undefined"){for(az in ay){if(ay[az].lang==an){return ay[az].value}}}for(az in ay){if(ay[az].lang==null){return ay[az].value}}for(az in ay){if(ay[az].lang==aa){return ay[az].value}}return null};var F=function(){var aB=[];var aA=0;var az;var ay;if(null!=y){for(az=0;az<y.length&&az<U-1;az++){aB[az]=T(y[az]);aA++}}I=b();for(az=aA,ay=0;az<I.length&&az<U;az++,ay++){aB.push(T(I[ay]))}return aB};var C=function(ay){var az=[];while(0!==I.length){var aA=I.pop();if(aA!=ay){az.unshift(aA)}}az.unshift(ay);I=az;return};var b=function(){var aE=[];var aD,aB;var aG;aG=document.cookie.split(";");for(aD=0;aD<aG.length;aD++){var ay=aG[aD];var aC=ay.indexOf("=");var aF=ay.substring(0,aC);var aA=ay.substring(aC+1);if("_saml_idp"==aF.replace(/^\s+|\s+$/g,"")){aA=aA.replace(/^\s+|\s+$/g,"").split("+");for(aB=0;aB<aA.length;aB++){if(0===aA[aB].length){continue}var az=ah(decodeURIComponent(aA[aB]));if(az.length>0){aE.push(az)}}}}return aE};var ag=function(aD){var aA=[];var aC=aD.length;if(aC>5){aC=5}for(var aB=0;aB<aC;aB++){if(aD[aB].length>0){aA.push(encodeURIComponent(s(aD[aB])))}}var ay=null;if(D){var az=new Date();cookieTTL=D*24*60*60*1000;ay=new Date(az.getTime()+cookieTTL)}document.cookie="_saml_idp="+aA.join("+")+"; path = /"+((ay===null)?"":"; expires="+ay.toUTCString())};var s=function(aH){var ay="",aC,aA,az,aG,aF,aE,aD;for(var aB=0;aB<aH.length;){aC=aH.charCodeAt(aB++);aA=aH.charCodeAt(aB++);az=aH.charCodeAt(aB++);aG=aC>>2;aF=((aC&3)<<4)+(aA>>4);aE=((aA&15)<<2)+(az>>6);aD=az&63;if(isNaN(aA)){aE=aD=64}else{if(isNaN(az)){aD=64}}ay+=N.charAt(aG)+N.charAt(aF)+N.charAt(aE)+N.charAt(aD)}return ay};var ah=function(aB){var az="",aI,aG,aE,aH,aF,aD,aC;var aA=0;var ay=/[^A-Za-z0-9\+\/\=]/g;aB=aB.replace(/[^A-Za-z0-9\+\/\=]/g,"");do{aH=N.indexOf(aB.charAt(aA++));aF=N.indexOf(aB.charAt(aA++));aD=N.indexOf(aB.charAt(aA++));aC=N.indexOf(aB.charAt(aA++));aI=(aH<<2)|(aF>>4);aG=((aF&15)<<4)|(aD>>2);aE=((aD&3)<<6)|aC;az=az+String.fromCharCode(aI);if(aD!=64){az=az+String.fromCharCode(aG)}if(aC!=64){az=az+String.fromCharCode(aE)}aI=aG=aE="";aH=aF=aD=aC=""}while(aA<aB.length);return az};var H=function(az){alert("FATAL - DISCO UI:"+az);var ay=document.createTextNode(az);aw.appendChild(ay)};var o=function(){}}(new IdPSelectUI()).draw(new IdPSelectUIParms());
\ No newline at end of file
+// created from http://svn.shibboleth.net/view/js-embedded-discovery?view=revision&revision=110 by pdurbin to support showListFirst per http://shibboleth.net/pipermail/users/2014-September/017355.html
+/*
+    http://www.JSON.org/json2.js
+    2011-02-23
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the value
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+*/
+
+/*jslint evil: true, strict: false, regexp: false */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+var JSON;
+if (!JSON) {
+    JSON = {};
+}
+
+(function () {
+    "use strict";
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function (key) {
+
+            return isFinite(this.valueOf()) ?
+                this.getUTCFullYear()     + '-' +
+                f(this.getUTCMonth() + 1) + '-' +
+                f(this.getUTCDate())      + 'T' +
+                f(this.getUTCHours())     + ':' +
+                f(this.getUTCMinutes())   + ':' +
+                f(this.getUTCSeconds())   + 'Z' : null;
+        };
+
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function (key) {
+                return this.valueOf();
+            };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string' ? c :
+                '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0 ? '[]' : gap ?
+                    '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' :
+                    '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0 ? '{}' : gap ?
+                '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' :
+                '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                    typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            text = String(text);
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function' ?
+                    walk({'': j}, '') : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
+
+function TypeAheadControl(jsonObj, box, orig, submit, maxchars, getName, getEntityId, geticon, ie6hack, alwaysShow, maxResults, getKeywords)
+{
+    //
+    // Squirrel away the parameters we were given
+    //
+    this.elementList = jsonObj;
+    this.textBox = box;
+    this.origin = orig;
+    this.submit = submit;
+    this.results = 0;
+    this.alwaysShow = alwaysShow;
+    this.maxResults = maxResults;
+    this.ie6hack = ie6hack;
+    this.maxchars = maxchars;
+    this.getName = getName;
+    this.getEntityId = getEntityId;
+    this.geticon = geticon;
+    this.getKeywords = getKeywords;
+}
+
+TypeAheadControl.prototype.draw = function(setFocus) {
+
+    //
+    // Make a closure on this so that the embedded functions
+    // get access to it.
+    //
+    var myThis = this;
+   
+    //
+    // Set up the 'dropDown'
+    //
+    this.dropDown = document.createElement('div');
+    this.dropDown.className = 'IdPSelectDropDown';
+    this.dropDown.style.visibility = 'hidden';
+
+    this.dropDown.style.width = this.textBox.offsetWidth;
+    this.dropDown.current = -1;
+    document.body.appendChild(this.dropDown);
+
+    //
+    // mouse listeners for the dropdown box
+    //
+    this.dropDown.onmouseover = function(event) {
+        if (!event) {
+            event = window.event;
+        }
+        var target;
+        if (event.target){
+            target = event.target;
+        }
+        if (typeof target == 'undefined') {
+            target = event.srcElement;
+        }
+        myThis.select(target);
+    };
+   
+    this.dropDown.onmousedown = function(event) {
+        if (-1 != myThis.dropDown.current) {
+            myThis.textBox.value = myThis.results[myThis.dropDown.current][0];
+        }
+    };
+
+    //
+    // Add the listeners to the text box
+    //
+    this.textBox.onkeyup = function(event) {
+        //
+        // get window event if needed (because of browser oddities)
+        //
+        if (!event) {
+            event = window.event;
+        }
+        myThis.handleKeyUp(event);
+    };
+
+    this.textBox.onkeydown = function(event) {
+        if (!event) {
+            event = window.event;
+        }
+
+        myThis.handleKeyDown(event);
+    };
+
+    this.textBox.onblur = function() {
+        myThis.hideDrop();
+    };
+
+    this.textBox.onfocus = function() {
+        myThis.handleChange();
+    };
+
+    if (null == setFocus || setFocus) {
+        this.textBox.focus();
+    }
+};
+
+//
+// Given a name return the first maxresults, or all possibles
+//
+TypeAheadControl.prototype.getPossible = function(name) {
+    var possibles = [];
+    var inIndex = 0;
+    var outIndex = 0;
+    var strIndex = 0;
+    var str;
+    var ostr;
+
+    name = name.toLowerCase();
+        
+    while (outIndex <= this.maxResults && inIndex < this.elementList.length) {
+        var hit = false;
+        var thisName = this.getName(this.elementList[inIndex]);
+
+        //
+        // Check name
+        //
+        if (thisName.toLowerCase().indexOf(name) != -1) {
+            hit = true;
+        }  
+        //
+        // Check entityID
+        //
+        if (!hit && this.getEntityId(this.elementList[inIndex]).toLowerCase().indexOf(name) != -1) {
+            hit = true;
+        }
+
+        if (!hit) {
+            var thisKeywords = this.getKeywords(this.elementList[inIndex]);
+            if (null != thisKeywords && 
+                thisKeywords.toLowerCase().indexOf(name) != -1) {
+                hit = true;
+            }
+        }  
+                
+        if (hit) {
+            possibles[outIndex] = [thisName, this.getEntityId(this.elementList[inIndex]), this.geticon(this.elementList[inIndex])];
+            outIndex ++;
+        }
+                
+        inIndex ++;
+    }
+    //
+    // reset the cursor to the top
+    //
+    this.dropDown.current = -1;
+    
+    return possibles;
+};
+
+TypeAheadControl.prototype.handleKeyUp = function(event) {
+    var key = event.keyCode;
+
+    if (27 == key) {
+        //
+        // Escape - clear
+        //
+        this.textBox.value = '';
+        this.handleChange();
+    } else if (8 == key || 32 == key || (key >= 46 && key < 112) || key > 123) {
+        //
+        // Backspace, Space and >=Del to <F1 and > F12
+        //
+        this.handleChange();
+    }
+};
+ 
+TypeAheadControl.prototype.handleKeyDown = function(event) {
+
+    var key = event.keyCode;
+
+    if (38 == key) {
+        //
+        // up arrow
+        //
+        this.upSelect();
+
+    } else if (40 == key) {
+        //
+        // down arrow
+        //
+        this.downSelect();
+    }
+};
+
+TypeAheadControl.prototype.hideDrop = function() {
+    var i = 0;
+    if (null !== this.ie6hack) {
+        while (i < this.ie6hack.length) {
+            this.ie6hack[i].style.visibility = 'visible';
+            i++;
+        }
+    }
+    this.dropDown.style.visibility = 'hidden';
+
+    if (-1 == this.dropDown.current) {
+        this.doUnselected();
+    }
+};
+
+TypeAheadControl.prototype.showDrop = function() {
+    var i = 0;
+    if (null !== this.ie6hack) {
+        while (i < this.ie6hack.length) {
+            this.ie6hack[i].style.visibility = 'hidden';
+            i++;
+        }
+    }
+    this.dropDown.style.visibility = 'visible';
+};
+
+
+TypeAheadControl.prototype.doSelected = function() {
+    this.submit.disabled = false;
+};
+
+TypeAheadControl.prototype.doUnselected = function() {
+    this.submit.disabled = true;
+};
+
+TypeAheadControl.prototype.handleChange = function() {
+
+    var val = this.textBox.value;
+    var res = this.getPossible(val);
+
+
+    if (0 === val.length || 
+        0 === res.length ||
+        (!this.alwaysShow && this.maxResults < res.length)) {
+        this.hideDrop();
+        this.doUnselected();
+        this.results = [];
+        this.dropDown.current = -1;
+    } else {
+        this.results = res;
+        this.populateDropDown(res);
+        if (1 == res.length) {
+            this.select(this.dropDown.childNodes[0]);
+            this.doSelected();
+        } else {
+            this.doUnselected();
+        }
+    }
+};
+
+//
+// A lot of the stuff below comes from 
+// http://www.webreference.com/programming/javascript/ncz/column2
+//
+// With thanks to Nicholas C Zakas
+//
+TypeAheadControl.prototype.populateDropDown = function(list) {
+    this.dropDown.innerHTML = '';
+    var i = 0;
+    var div;
+    var img;
+    var str;
+
+    while (i < list.length) {
+        div = document.createElement('div');
+        str = list[i][0];
+
+	if (null !== list[i][2]) {
+
+	    img = document.createElement('img');
+	    img.src = list[i][2];
+	    img.width = 16;
+	    img.height = 16;
+	    img.alt = '';
+	    div.appendChild(img);
+	    //
+	    // trim string back further in this case
+	    //
+	    if (str.length > this.maxchars - 2) {
+		str = str.substring(0, this.maxchars - 2);
+	    }
+	    str = ' ' + str;
+	} else {
+	    if (str.length > this.maxchars) {
+		str = str.substring(0, this.maxchars);
+	    }
+	}
+        div.appendChild(document.createTextNode(str));
+
+        this.dropDown.appendChild(div);
+        i++;
+    }
+    var off = this.getXY();
+    this.dropDown.style.left = off[0] + 'px';
+    this.dropDown.style.top = off[1] + 'px';
+    this.showDrop();
+};
+
+TypeAheadControl.prototype.getXY = function() {
+
+    var node = this.textBox;
+    var sumX = 0;
+    var sumY = node.offsetHeight;
+   
+    while(node.tagName != 'BODY') {
+        sumX += node.offsetLeft;
+        sumY += node.offsetTop;
+        node = node.offsetParent;
+    }
+    //
+    // And add in the offset for the Body
+    //
+    sumX += node.offsetLeft;
+    sumY += node.offsetTop;
+
+    return [sumX, sumY];
+};
+
+TypeAheadControl.prototype.select = function(selected) {
+    var i = 0;
+    var node;
+    this.dropDown.current = -1;
+    this.doUnselected();
+    while (i < this.dropDown.childNodes.length) {
+        node = this.dropDown.childNodes[i];
+        if (node == selected) {
+            //
+            // Highlight it
+            //
+            node.className = 'IdPSelectCurrent';
+            //
+            // turn on the button
+            //
+            this.doSelected();
+            //
+            // setup the cursor
+            //
+            this.dropDown.current = i;
+            //
+            // and the value for the Server
+            //
+            this.origin.value = this.results[i][1];
+            this.origin.textValue = this.results[i][0];
+        } else {
+            node.className = '';
+        }
+        i++;
+    }
+    this.textBox.focus();
+};
+
+TypeAheadControl.prototype.downSelect = function() {
+    if (this.results.length > 0) {
+
+        if (-1 == this.dropDown.current) {
+            //
+            // mimic a select()
+            //
+            this.dropDown.current = 0;
+            this.dropDown.childNodes[0].className = 'IdPSelectCurrent';
+            this.doSelected();
+            this.origin.value = this.results[0][1];
+            this.origin.textValue = this.results[0][0];
+
+        } else if (this.dropDown.current < (this.results.length-1)) {
+            //
+            // turn off highlight
+            //
+            this.dropDown.childNodes[this.dropDown.current].className = '';
+            //
+            // move cursor
+            //
+            this.dropDown.current++;
+            //
+            // and 'select'
+            //
+            this.dropDown.childNodes[this.dropDown.current].className = 'IdPSelectCurrent';
+            this.doSelected();
+            this.origin.value = this.results[this.dropDown.current][1];
+            this.origin.textValue = this.results[this.dropDown.current][0];
+
+        }
+    }
+};
+
+
+TypeAheadControl.prototype.upSelect = function() {
+    if ((this.results.length > 0) &&
+        (this.dropDown.current > 0)) {
+    
+            //
+            // turn off highlight
+            //
+            this.dropDown.childNodes[this.dropDown.current].className = '';
+            //
+            // move cursor
+            //
+            this.dropDown.current--;
+            //
+            // and 'select'
+            //
+            this.dropDown.childNodes[this.dropDown.current].className = 'IdPSelectCurrent';
+            this.doSelected();
+            this.origin.value = this.results[this.dropDown.current][1];
+            this.origin.textValue = this.results[this.dropDown.current][0];
+        }
+};
+function IdPSelectUI() {
+    //
+    // module locals
+    //
+    var idpData;
+    var base64chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+    var idpSelectDiv;
+    var lang;
+    var majorLang;
+    var defaultLang;
+    var langBundle;
+    var defaultLangBundle;
+    var defaultLogo;
+    var defaultLogoWidth;
+    var defaultLogoHeight;
+    var minWidth;
+    var minHeight;
+    var maxWidth;
+    var maxHeight;
+    var bestRatio;
+
+    //
+    // Parameters passed into our closure
+    //
+    var preferredIdP;
+    var maxPreferredIdPs;
+    var helpURL;
+    var ie6Hack;
+    var samlIdPCookieTTL;
+    var maxIdPCharsDropDown;
+    var maxIdPCharsButton;
+    var maxIdPCharsAltTxt;
+    var alwaysShow;
+    var maxResults;
+    var ignoreKeywords;
+    var showListFirst;
+
+    //
+    // The cookie contents
+    //
+    var userSelectedIdPs;
+    //
+    // Anchors used inside autofunctions
+    //
+    var idpEntryDiv;
+    var idpListDiv;
+    var idpSelect;
+    var listButton;
+    
+    //
+    // local configuration
+    //
+    var idPrefix = 'idpSelect';
+    var classPrefix = 'IdPSelect';
+    var dropDownControl;
+
+    //
+    // DS protocol configuration
+    //
+    var returnString = '';
+    var returnBase='';
+    var returnParms= [];
+    var returnIDParam = 'entityID';
+
+    // *************************************
+    // Public functions
+    // *************************************
+    
+    /**
+       Draws the IdP Selector UI on the screen.  This is the main
+       method for the IdPSelectUI class.
+    */
+    this.draw = function(parms){
+
+        if (!setupLocals(parms)) {
+            return;
+        }
+
+        idpSelectDiv = document.getElementById(parms.insertAtDiv);
+        if(!idpSelectDiv){
+            fatal(getLocalizedMessage('fatal.divMissing'));
+            return;
+        }
+
+        if (!load(parms.dataSource)) {
+            return;
+        }
+        stripHidden(parms.hiddenIdPs);
+
+        idpData.sort(function(a,b) {return getLocalizedName(a).localeCompare(getLocalizedName(b));});
+        
+        var idpSelector = buildIdPSelector();
+        idpSelectDiv.appendChild(idpSelector);
+        dropDownControl.draw(parms.setFocusTextBox);
+    } ;
+    
+    // *************************************
+    // Private functions
+    //
+    // Data Manipulation
+    //
+    // *************************************
+
+    /**
+       Copies the "parameters" in the function into namesspace local
+       variables.  This means most of the work is done outside the
+       IdPSelectUI object
+    */
+
+    var setupLocals = function (paramsSupplied) {
+        //
+        // Copy parameters in
+        //
+        var suppliedEntityId;
+
+        preferredIdP = paramsSupplied.preferredIdP;
+        maxPreferredIdPs = paramsSupplied.maxPreferredIdPs;
+        helpURL = paramsSupplied.helpURL;
+        ie6Hack = paramsSupplied.ie6Hack;
+        samlIdPCookieTTL = paramsSupplied.samlIdPCookieTTL;
+        alwaysShow = paramsSupplied.alwaysShow;
+        maxResults = paramsSupplied.maxResults;
+        ignoreKeywords = paramsSupplied.ignoreKeywords;
+        if (paramsSupplied.showListFirst) {
+            showListFirst = paramsSupplied.showListFirst;
+        } else {
+            showListFirst = false;
+        }
+        defaultLogo = paramsSupplied.defaultLogo;
+        defaultLogoWidth = paramsSupplied.defaultLogoWidth;
+        defaultLogoHeight = paramsSupplied.defaultLogoHeight;
+        minWidth = paramsSupplied.minWidth;
+        minHeight = paramsSupplied.minHeight;
+        maxWidth = paramsSupplied.maxWidth;
+        maxHeight = paramsSupplied.maxHeight;
+        bestRatio = paramsSupplied.bestRatio;
+        maxIdPCharsButton = paramsSupplied.maxIdPCharsButton;
+        maxIdPCharsDropDown = paramsSupplied.maxIdPCharsDropDown;
+        maxIdPCharsAltTxt = paramsSupplied.maxIdPCharsAltTxt;
+
+        if (typeof navigator == 'undefined') {
+            lang = paramsSupplied.defaultLanguage;
+        } else {
+            lang = navigator.language || navigator.userLanguage || paramsSupplied.defaultLanguage;
+        }
+        if (lang.indexOf('-') > 0) {
+            majorLang = lang.substring(0, lang.indexOf('-'));
+        }
+
+        defaultLang = paramsSupplied.defaultLanguage;
+
+        if (typeof paramsSupplied.langBundles[lang] != 'undefined') {
+            langBundle = paramsSupplied.langBundles[lang];
+        } else if (typeof majorLang != 'undefined' && typeof paramsSupplied.langBundles[majorLang] != 'undefined') {
+            langBundle = paramsSupplied.langBundles[majorLang];
+        }
+        defaultLangBundle = paramsSupplied.langBundles[paramsSupplied.defaultLanguage];
+
+        //
+        // Setup Language bundles
+        //
+        if (!defaultLangBundle) {
+            fatal('No languages work');
+            return false;
+        }
+        if (!langBundle) {
+            debug('No language support for ' + lang);
+            langBundle = defaultLangBundle;
+        }
+
+        if (paramsSupplied.testGUI) {
+            //
+            // no policing of parms
+            //
+            return true;
+        }
+        //
+        // Now set up the return values from the URL
+        //
+        var policy = 'urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single';
+        var i;
+        var isPassive = false;
+        var parms;
+        var parmPair;
+        var win = window;
+        while (null !== win.parent && win !== win.parent) {
+            win = win.parent;
+        }
+        var loc = win.location;
+        var parmlist = loc.search;
+        if (null == parmlist || 0 == parmlist.length || parmlist.charAt(0) != '?') {
+
+            if (null == paramsSupplied.defaultReturn) {
+
+                fatal(getLocalizedMessage('fatal.noparms'));
+                return false;
+            }
+            //
+            // No parameters, so just collect the defaults
+            //
+            suppliedEntityId  = paramsSupplied.myEntityID;
+            returnString = paramsSupplied.defaultReturn;
+            if (null != paramsSupplied.defaultReturnIDParam) {
+                returnIDParam = paramsSupplied.defaultReturnIDParam;
+            }
+            
+        } else {
+            parmlist = parmlist.substring(1);
+
+            //
+            // protect against various hideousness by decoding. We re-encode just before we push
+            //
+
+            parms = parmlist.split('&');
+            if (parms.length === 0) {
+
+                fatal(getLocalizedMessage('fatal.noparms'));
+                return false;
+            }
+
+            for (i = 0; i < parms.length; i++) {
+                parmPair = parms[i].split('=');
+                if (parmPair.length != 2) {
+                    continue;
+                }
+                if (parmPair[0] == 'entityID') {
+                    suppliedEntityId = decodeURIComponent(parmPair[1]);
+                } else if (parmPair[0] == 'return') {
+                    returnString = decodeURIComponent(parmPair[1]);
+                } else if (parmPair[0] == 'returnIDParam') {
+                    returnIDParam = decodeURIComponent(parmPair[1]);
+                } else if (parmPair[0] == 'policy') {
+                    policy = decodeURIComponent(parmPair[1]);
+                } else if (parmPair[0] == 'isPassive') {
+                    isPassive = (parmPair[1].toUpperCase() == "TRUE");
+                }
+            }
+        }
+        if (policy != 'urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single') {
+            fatal(getLocalizedMessage('fatal.wrongProtocol'));
+            return false;
+        }
+        if (paramsSupplied.myEntityID !== null && paramsSupplied.myEntityID != suppliedEntityId) {
+            fatal(getLocalizedMessage('fatal.wrongEntityId') + '"' + suppliedEntityId + '" != "' + paramsSupplied.myEntityID + '"');
+            return false;
+        }
+        if (null === returnString || returnString.length === 0) {
+            fatal(getLocalizedMessage('fatal.noReturnURL'));
+            return false;
+        }
+        if (!validProtocol(returnString)) {
+            fatal(getLocalizedMessage('fatal.badProtocol'));
+            return false;
+        }
+
+        //
+        // isPassive
+        //
+        if (isPassive) {
+            var prefs = retrieveUserSelectedIdPs();
+            if (prefs.length == 0) {
+                //
+                // no preference, go back
+                //
+                location.href = returnString;
+                return false;
+            } else {
+                var retString = returnIDParam + '=' + encodeURIComponent(prefs[0]);
+                //
+                // Compose up the URL
+                //
+                if (returnString.indexOf('?') == -1) {
+                    retString = '?' + retString;
+                } else {
+                    retString = '&' + retString;
+                }
+                location.href = returnString + retString;
+                return false;
+            }            
+        }
+
+        //
+        // Now split up returnString
+        //
+        i = returnString.indexOf('?');
+        if (i < 0) {
+            returnBase = returnString;
+            return true;
+        }
+        returnBase = returnString.substring(0, i);
+        parmlist = returnString.substring(i+1);
+        parms = parmlist.split('&');
+        for (i = 0; i < parms.length; i++) {
+            parmPair = parms[i].split('=');
+            if (parmPair.length != 2) {
+                continue;
+            }
+            parmPair[1] = decodeURIComponent(parmPair[1]);
+            returnParms.push(parmPair);
+        }
+        return true;
+    };
+
+    /**
+       Strips the supllied IdP list from the idpData
+    */
+    var stripHidden = function(hiddenList) {
+    
+        if (null == hiddenList || 0 == hiddenList.length) {
+            return;
+        }
+        var i;
+        var j;
+        for (i = 0; i < hiddenList.length; i++) {
+            for (j = 0; j < idpData.length; j++) {
+                if (getEntityId(idpData[j]) == hiddenList[i]) {
+                    idpData.splice(j, 1);
+                    break;
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Strip the "protocol://host" bit out of the URL and check the protocol
+     * @param the URL to process
+     * @return whether it starts with http: or https://
+     */
+
+    var validProtocol = function(s) {
+        if (null === s) {
+            return false;
+        }
+        var marker = "://";
+        var protocolEnd = s.indexOf(marker);
+        if (protocolEnd < 0) {
+            return false;
+        }
+        s = s.substring(0, protocolEnd);
+        if (s == "http" || s== "https") {
+            return true;
+        }
+        return false;
+    };
+
+    /**
+     * We need to cache bust on IE.  So how do we know?  Use a bigger hammer.
+     */
+    var isIE = function() {
+        if (null == navigator) {
+            return false;
+        }
+        var browserName = navigator.appName;
+        if (null == browserName) {
+            return false;
+        }
+        return (browserName == 'Microsoft Internet Explorer') ;
+    } ;
+
+
+    /**
+       Loads the data used by the IdP selection UI.  Data is loaded 
+       from a JSON document fetched from the given url.
+      
+       @param {Function} failureCallback A function called if the JSON
+       document can not be loaded from the source.  This function will
+       passed the {@link XMLHttpRequest} used to request the JSON data.
+    */
+    var load = function(dataSource){
+        var xhr = null;
+
+        try {
+            xhr = new XMLHttpRequest();
+        } catch (e) {}
+        if (null == xhr) {
+            //
+            // EDS24. try to get 'Microsoft.XMLHTTP'
+            //
+            try {
+                xhr = new ActiveXObject("Microsoft.XMLHTTP");
+            } catch (e) {}
+        }
+        if (null == xhr) {
+            //
+            // EDS35. try to get 'Microsoft.XMLHTTP'
+            //
+            try {
+                xhr = new  ActiveXObject('MSXML2.XMLHTTP.3.0');
+            } catch (e) {}
+        }
+        if (null == xhr) {
+            fatal(getLocalizedMessage('fatal.noXMLHttpRequest'));
+            return false;
+        }
+
+        if (isIE()) {
+            //
+            // cache bust (for IE)
+            //
+            dataSource += '?random=' + (Math.random()*1000000);
+        }
+
+        //
+        // Grab the data
+        //
+        xhr.open('GET', dataSource, false);
+        if (typeof xhr.overrideMimeType == 'function') {
+            xhr.overrideMimeType('application/json');
+        }
+        xhr.send(null);
+        
+        if(xhr.status == 200){
+            //
+            // 200 means we got it OK from as web source
+            // if locally loading its 0.  Go figure
+            //
+            var jsonData = xhr.responseText;
+            if(jsonData === null){
+                fatal(getLocalizedMessage('fatal.noData'));
+                return false;
+            }
+
+            //
+            // Parse it
+            //
+
+            idpData = JSON.parse(jsonData);
+
+        }else{
+            fatal(getLocalizedMessage('fatal.loadFailed') + dataSource);
+            return false;
+        }
+        return true;
+    };
+
+    /**
+       Returns the idp object with the given name.
+
+       @param (String) the name we are interested in
+       @return (Object) the IdP we care about
+    */
+
+    var getIdPFor = function(idpName) {
+
+        for (var i = 0; i < idpData.length; i++) {
+            if (getEntityId(idpData[i]) == idpName) {
+                return idpData[i];
+            }
+        }
+        return null;
+    };
+
+    /**
+       Returns a suitable image from the given IdP
+       
+       @param (Object) The IdP
+       @return Object) a DOM object suitable for insertion
+       
+       TODO - rather more careful selection
+    */
+
+    var getImageForIdP = function(idp) {
+
+        var getBestFit = function(language) {
+            //
+            // See GetLocalizedEntry
+            //
+            var bestFit = null;
+            var i;
+            if (null == idp.Logos) {
+                return null;
+            }
+            for (i in idp.Logos) {
+                if (idp.Logos[i].lang == language &&
+                    idp.Logos[i].width != null &&  
+                    idp.Logos[i].width >= minWidth &&
+                    idp.Logos[i].height != null && 
+                    idp.Logos[i].height >= minHeight) {
+                    if (bestFit === null) {
+                        bestFit = idp.Logos[i];
+                    } else {
+                        me = Math.abs(bestRatio - Math.log(idp.Logos[i].width/idp.Logos[i].height));
+                        him = Math.abs(bestRatio - Math.log(bestFit.width/bestFit.height));
+                        if (him > me) {
+                            bestFit = idp.Logos[i];
+                        }
+                    }
+                }
+            }
+            return bestFit;
+        } ;
+
+        var bestFit = null;
+        var img = document.createElement('img');
+
+        bestFit = getBestFit(lang);
+        if (null === bestFit && typeof majorLang != 'undefined') {
+            bestFit = getBestFit(majorLang);
+        }
+        if (null === bestFit) {
+            bestFit = getBestFit(null);
+        }
+        if (null === bestFit) {
+            bestFit = getBestFit(defaultLang);
+        }
+               
+
+        if (null === bestFit) {
+            img.src = defaultLogo;
+            img.width = defaultLogoWidth;
+            img.height = defaultLogoHeight;
+            img.alt = getLocalizedMessage('defaultLogoAlt');
+            return img;
+        }
+
+        img.src = bestFit.value;
+        var altTxt = getLocalizedName(idp);
+        if (altTxt.length > maxIdPCharsAltTxt) {
+            altTxt = altTxt.substring(0, maxIdPCharsAltTxt) + '...';
+        }
+        img.alt = altTxt;
+
+        var w = bestFit.width;
+        var h = bestFit.height;
+        if (w>maxWidth) {
+            h = (maxWidth/w) * h;
+            w = maxWidth;
+        }
+        if (h> maxHeight) {
+            w = (maxHeight/h) * w;
+            w = maxHeight;
+        }
+            
+        img.setAttribute('width', w);
+        img.setAttribute('height', h);
+        return img;
+    };
+
+    // *************************************
+    // Private functions
+    //
+    // GUI Manipulation
+    //
+    // *************************************
+    
+    /**
+       Builds the IdP selection UI.
+
+       Three divs. PreferredIdPTime, EntryTile and DropdownTile
+      
+       @return {Element} IdP selector UI
+    */
+    var buildIdPSelector = function(){
+        var containerDiv = buildDiv('IdPSelector');
+        var preferredTileExists;
+        preferredTileExists = buildPreferredIdPTile(containerDiv);
+        buildIdPEntryTile(containerDiv, preferredTileExists);
+        buildIdPDropDownListTile(containerDiv, preferredTileExists);
+        return containerDiv;
+    };
+
+    /**
+      Builds a button for the provided IdP
+        <div class="preferredIdPButton">
+          <a href="XYX" onclick=setparm('ABCID')>
+            <div class=
+            <img src="https:\\xyc.gif"> <!-- optional -->
+            XYX Text
+          </a>
+        </div>
+
+      @param (Object) The IdP
+      
+      @return (Element) preselector for the IdP
+    */
+
+    var composePreferredIdPButton = function(idp, uniq) {
+        var div = buildDiv(undefined, 'PreferredIdPButton');
+        var aval = document.createElement('a');
+        var retString = returnIDParam + '=' + encodeURIComponent(getEntityId(idp));
+        var retVal = returnString;
+        var img = getImageForIdP(idp);
+        //
+        // Compose up the URL
+        //
+        if (retVal.indexOf('?') == -1) {
+            retString = '?' + retString;
+        } else {
+            retString = '&' + retString;
+        }
+        aval.href = retVal + retString;
+        aval.onclick = function () {
+            selectIdP(getEntityId(idp));
+        };
+        var imgDiv=buildDiv(undefined, 'PreferredIdPImg');
+        imgDiv.appendChild(img);
+        aval.appendChild(imgDiv);
+
+        var nameDiv = buildDiv(undefined, 'TextDiv');
+        var nameStr = getLocalizedName(idp);
+        if (nameStr.length > maxIdPCharsButton) {
+            nameStr = nameStr.substring(0, maxIdPCharsButton) + '...';
+        }
+        div.title = nameStr;
+        nameDiv.appendChild(document.createTextNode(nameStr));
+        aval.appendChild(nameDiv);
+
+        div.appendChild(aval);
+        return div;
+    };
+
+    /**
+     * Builds and populated a text Div
+     */
+    var buildTextDiv = function(parent, textId)
+    {
+        var div  = buildDiv(undefined, 'TextDiv');
+        var introTxt = document.createTextNode(getLocalizedMessage(textId)); 
+        div.appendChild(introTxt);
+        parent.appendChild(div);
+    } ;
+
+    var setSelector = function (selector, selected) {
+        if (null === selected || 0 === selected.length || '-' == selected.value) {
+            return;
+        }
+        var i = 0;
+        while (i < selector.options.length) {
+            if (selector.options[i].value == selected) {
+                selector.options[i].selected = true;
+                break;
+            }
+            i++;
+        }
+    }
+
+    /**
+       Builds the preferred IdP selection UI (top half of the UI w/ the
+       IdP buttons)
+
+       <div id=prefix+"PreferredIdPTile">
+          <div> [see comprosePreferredIdPButton </div>
+          [repeated]
+       </div>
+      
+       @return {Element} preferred IdP selection UI
+    */
+    var buildPreferredIdPTile = function(parentDiv) {
+
+        var preferredIdPs = getPreferredIdPs();
+        if (0 === preferredIdPs.length) {
+            return false;
+        }
+
+        var preferredIdPDIV = buildDiv('PreferredIdPTile');
+
+        buildTextDiv(preferredIdPDIV, 'idpPreferred.label');
+
+        for(var i = 0 ; i < maxPreferredIdPs && i < preferredIdPs.length; i++){
+            if (preferredIdPs[i]) {
+                var button = composePreferredIdPButton(preferredIdPs[i],i);
+                preferredIdPDIV.appendChild(button);
+            }
+        }
+
+        parentDiv.appendChild(preferredIdPDIV);
+        return true;
+    };
+
+    /**
+     * Build the <form> from the return parameters
+     */
+
+    var buildSelectForm = function ()
+    {
+        var form = document.createElement('form');
+        idpEntryDiv.appendChild(form);
+
+        form.action = returnBase;
+        form.method = 'GET';
+        form.setAttribute('autocomplete', 'OFF');
+        var i = 0;
+        for (i = 0; i < returnParms.length; i++) {
+            var hidden = document.createElement('input');
+            hidden.setAttribute('type', 'hidden');
+            hidden.name = returnParms[i][0];
+            hidden.value= returnParms[i][1];
+            form.appendChild(hidden);
+        }
+
+        return form;
+    } ;
+
+
+    /**
+       Build the manual IdP Entry tile (bottom half of UI with
+       search-as-you-type field).
+
+       <div id = prefix+"IdPEntryTile">
+         <form>
+           <input type="text", id=prefix+"IdPSelectInput/> // select text box
+           <input type="hidden" /> param to send
+           <input type="submit" />
+           
+      
+       @return {Element} IdP entry UI tile
+    */
+    var buildIdPEntryTile = function(parentDiv, preferredTile) {
+
+
+        idpEntryDiv = buildDiv('IdPEntryTile');
+        if (showListFirst) {
+            idpEntryDiv.style.display = 'none';
+        }
+
+        if (preferredTile) {
+            buildTextDiv(idpEntryDiv, 'idpEntry.label');
+        } else {
+            buildTextDiv(idpEntryDiv, 'idpEntry.NoPreferred.label');
+        }
+
+        var form = buildSelectForm();
+      
+        var textInput = document.createElement('input');
+        form.appendChild(textInput);
+
+        textInput.type='text';
+        setID(textInput, 'Input');
+
+        var hidden = document.createElement('input');
+        hidden.setAttribute('type', 'hidden');
+        form.appendChild(hidden);
+
+        hidden.name = returnIDParam;
+        hidden.value='-';
+
+        var button = buildContinueButton('Select');
+        button.disabled = true;
+        form.appendChild(button);
+        
+        form.onsubmit = function () {
+            //
+            // Make sure we cannot ask for garbage
+            //
+            if (null === hidden.value || 0 === hidden.value.length || '-' == hidden.value) {
+                return false;
+            }
+            //
+            // And always ask for the cookie to be updated before we continue
+            //
+            textInput.value = hidden.textValue;
+            selectIdP(hidden.value);
+            return true;
+        };
+
+        dropDownControl = new TypeAheadControl(idpData, textInput, hidden, button, maxIdPCharsDropDown, getLocalizedName, getEntityId, geticon, ie6Hack, alwaysShow, maxResults, getKeywords);
+
+        var a = document.createElement('a');
+        a.appendChild(document.createTextNode(getLocalizedMessage('idpList.showList')));
+        a.href = '#';
+        setClass(a, 'DropDownToggle');
+        a.onclick = function() { 
+            idpEntryDiv.style.display='none';
+            setSelector(idpSelect, hidden.value);
+            idpListDiv.style.display='inline';
+            listButton.focus();
+        };
+        idpEntryDiv.appendChild(a);
+        buildHelpText(idpEntryDiv);
+                                              
+        parentDiv.appendChild(idpEntryDiv);
+    };
+    
+    /**
+       Builds the drop down list containing all the IdPs from which a
+       user may choose.
+
+       <div id=prefix+"IdPListTile">
+          <label for="idplist">idpList.label</label>
+          <form action="URL from IDP Data" method="GET">
+          <select name="param from IdP data">
+             <option value="EntityID">Localized Entity Name</option>
+             [...]
+          </select>
+          <input type="submit"/>
+       </div>
+        
+       @return {Element} IdP drop down selection UI tile
+    */
+    var buildIdPDropDownListTile = function(parentDiv, preferredTile) {
+        idpListDiv = buildDiv('IdPListTile');
+        if (!showListFirst) {
+            idpListDiv.style.display = 'none';
+        }
+
+        if (preferredTile) {
+            buildTextDiv(idpListDiv, 'idpList.label');
+        } else {
+            buildTextDiv(idpListDiv, 'idpList.NoPreferred.label');
+        }
+
+        idpSelect = document.createElement('select');
+        setID(idpSelect, 'Selector');
+        idpSelect.name = returnIDParam;
+        idpListDiv.appendChild(idpSelect);
+        
+        var idpOption = buildSelectOption('-', getLocalizedMessage('idpList.defaultOptionLabel'));
+        idpOption.selected = true;
+
+        idpSelect.appendChild(idpOption);
+    
+        var idp;
+        for(var i=0; i<idpData.length; i++){
+            idp = idpData[i];
+            idpOption = buildSelectOption(getEntityId(idp), getLocalizedName(idp));
+            idpSelect.appendChild(idpOption);
+        }
+
+        var form = buildSelectForm();
+
+        form.appendChild(idpSelect);
+
+        form.onsubmit = function () {
+            //
+            // The first entery isn't selectable
+            //
+            if (idpSelect.selectedIndex < 1) {
+                return false;
+            }
+            //
+            // otherwise update the cookie
+            //
+            selectIdP(idpSelect.options[idpSelect.selectedIndex].value);
+            return true;
+        };
+
+        var button = buildContinueButton('List');
+        listButton = button;
+        form.appendChild(button);
+
+        idpListDiv.appendChild(form);
+
+        //
+        // The switcher
+        //
+        var a = document.createElement('a');
+        a.appendChild(document.createTextNode(getLocalizedMessage('idpList.showSearch')));
+        a.href = '#';
+        setClass(a, 'DropDownToggle');
+        a.onclick = function() { 
+            idpEntryDiv.style.display='inline';
+            idpListDiv.style.display='none';
+        };
+        idpListDiv.appendChild(a);
+        buildHelpText(idpListDiv);
+
+        parentDiv.appendChild(idpListDiv);
+    };
+
+    /**
+       Builds the 'continue' button used to submit the IdP selection.
+      
+       @return {Element} HTML button used to submit the IdP selection
+    */
+    var buildContinueButton = function(which) {
+        var button  = document.createElement('input');
+        button.setAttribute('type', 'submit');
+        button.value = getLocalizedMessage('submitButton.label');
+        setID(button, which + 'Button');
+
+        return button;
+    };
+
+    /**
+       Builds an aref to point to the helpURL
+    */
+
+    var buildHelpText = function(containerDiv) {
+        var aval = document.createElement('a');
+        aval.href = helpURL;
+        aval.appendChild(document.createTextNode(getLocalizedMessage('helpText')));
+        setClass(aval, 'HelpButton');
+        containerDiv.appendChild(aval);
+    } ;
+    
+    /**
+       Creates a div element whose id attribute is set to the given ID.
+      
+       @param {String} id ID for the created div element
+       @param {String} [class] class of the created div element
+       @return {Element} DOM 'div' element with an 'id' attribute
+    */
+    var buildDiv = function(id, whichClass){
+        var div = document.createElement('div');
+        if (undefined !== id) {
+            setID(div, id);
+        }
+        if(undefined !== whichClass) {
+
+            setClass(div, whichClass);
+        }
+        return div;
+    };
+    
+    /**
+       Builds an HTML select option element
+      
+       @param {String} value value of the option when selected
+       @param {String} label displayed label of the option
+    */
+    var buildSelectOption = function(value, text){
+        var option = document.createElement('option');
+        option.value = value;
+        if (text.length > maxIdPCharsDropDown) {
+            text = text.substring(0, maxIdPCharsDropDown);
+        }
+        option.appendChild(document.createTextNode(text));
+        return option;
+    };
+    
+    /**
+       Sets the attribute 'id' on the provided object
+       We do it through this function so we have a single
+       point where we can prepend a value
+       
+       @param (Object) The [DOM] Object we want to set the attribute on
+       @param (String) The Id we want to set
+    */
+
+    var setID = function(obj, name) {
+        obj.id = idPrefix + name;
+    };
+
+    var setClass = function(obj, name) {
+        obj.setAttribute('class', classPrefix + name);
+    };
+
+    /**
+       Returns the DOM object with the specified id.  We abstract
+       through a function to allow us to prepend to the name
+       
+       @param (String) the (unprepended) id we want
+    */
+    var locateElement = function(name) {
+        return document.getElementById(idPrefix + name);
+    };
+
+    // *************************************
+    // Private functions
+    //
+    // GUI actions.  Note that there is an element of closure going on
+    // here since these names are invisible outside this module.
+    // 
+    //
+    // *************************************
+
+    /**
+     * Base helper function for when an IdP is selected
+     * @param (String) The UN-encoded entityID of the IdP
+    */
+
+    var selectIdP = function(idP) {
+        updateSelectedIdPs(idP);
+        saveUserSelectedIdPs(userSelectedIdPs);
+    };
+
+    // *************************************
+    // Private functions
+    //
+    // Localization handling
+    //
+    // *************************************
+
+    /**
+       Gets a localized string from the given language pack.  This
+       method uses the {@link langBundles} given during construction
+       time.
+
+       @param {String} messageId ID of the message to retrieve
+
+       @return (String) the message
+    */
+    var getLocalizedMessage = function(messageId){
+
+        var message = langBundle[messageId];
+        if(!message){
+            message = defaultLangBundle[messageId];
+        }
+        if(!message){
+            message = 'Missing message for ' + messageId;
+        }
+        
+        return message;
+    };
+
+    var getEntityId = function(idp) {
+        return idp.entityID;
+    };
+
+    /**
+       Returns the icon information for the provided idp
+
+       @param (Object) an idp.  This should have an array 'names' with sub
+        elements 'lang' and 'name'.
+
+       @return (String) The localized name
+    */
+    var geticon = function(idp) {
+        var i;
+
+        if (null == idp.Logos) { 
+            return null;
+        }
+        for (i =0; i < idp.Logos.length; i++) {
+	    var logo = idp.Logos[i];
+
+	    if (logo.height == "16" && logo.width == "16") {
+		if (null == logo.lang ||
+		    lang == logo.lang ||
+		    (typeof majorLang != 'undefined' && majorLang == logo.lang) ||
+		    defaultLang == logo.lang) {
+		    return logo.value;
+		}
+	    }
+	}
+
+	return null;
+    } ;
+
+    /**
+       Returns the localized name information for the provided idp
+
+       @param (Object) an idp.  This should have an array 'names' with sub
+        elements 'lang' and 'name'.
+
+       @return (String) The localized name
+    */
+    var getLocalizedName = function(idp) {
+        var res = getLocalizedEntry(idp.DisplayNames);
+        if (null !== res) {
+            return res;
+        }
+        debug('No Name entry in any language for ' + getEntityId(idp));
+        return getEntityId(idp);
+    } ;
+
+    var getKeywords = function(idp) {
+        if (ignoreKeywords || null == idp.Keywords) {
+            return null;
+        }
+        var s = getLocalizedEntry(idp.Keywords);
+
+        return s;
+    }
+        
+    var getLocalizedEntry = function(theArray){
+        var i;
+
+        //
+        // try by full name
+        //
+        for (i in theArray) {
+            if (theArray[i].lang == lang) {
+                return theArray[i].value;
+            }
+        }
+        //
+        // then by major language
+        //
+        if (typeof majorLang != 'undefined') {
+            for (i in theArray) {
+                if (theArray[i].lang == majorLang) {
+                    return theArray[i].value;
+                }
+            }
+        }
+        //
+        // then by null language in metadata
+        //
+        for (i in theArray) {
+            if (theArray[i].lang == null) {
+                return theArray[i].value;
+            }
+        }
+        
+        //
+        // then by default language
+        //
+        for (i in theArray) {
+            if (theArray[i].lang == defaultLang) {
+                return theArray[i].value;
+            }
+        }
+
+        return null;
+    };
+
+    
+    // *************************************
+    // Private functions
+    //
+    // Cookie and preferred IdP Handling
+    //
+    // *************************************
+
+    /**
+       Gets the preferred IdPs.  The first elements in the array will
+       be the preselected preferred IdPs.  The following elements will
+       be those past IdPs selected by a user.  The size of the array
+       will be no larger than the maximum number of preferred IdPs.
+    */
+    var getPreferredIdPs = function() {
+        var idps = [];
+        var offset = 0;
+        var i;
+        var j;
+
+        //
+        // populate start of array with preselected IdPs
+        //
+        if(null != preferredIdP){
+            for(i=0; i < preferredIdP.length && i < maxPreferredIdPs-1; i++){
+                idps[i] = getIdPFor(preferredIdP[i]);
+                offset++;
+            }
+        }
+        
+        //
+        // And then the cookie based ones
+        //
+        userSelectedIdPs = retrieveUserSelectedIdPs();
+        for (i = offset, j=0; i < userSelectedIdPs.length && i < maxPreferredIdPs; i++, j++){
+            idps.push(getIdPFor(userSelectedIdPs[j]));
+        }
+        return idps;
+    };
+
+    /**
+       Update the userSelectedIdPs list with the new value.
+
+       @param (String) the newly selected IdP
+    */
+    var updateSelectedIdPs = function(newIdP) {
+
+        //
+        // We cannot use split since it does not appear to
+        // work as per spec on ie8.
+        //
+        var newList = [];
+
+        //
+        // iterate through the list copying everything but the old
+        // name
+        //
+        while (0 !== userSelectedIdPs.length) {
+            var what = userSelectedIdPs.pop();
+            if (what != newIdP) {
+                newList.unshift(what);
+            }
+        }
+
+        //
+        // And shove it in at the top
+        //
+        newList.unshift(newIdP);
+        userSelectedIdPs = newList;
+        return;
+    };
+    
+    /**
+       Gets the IdP previously selected by the user.
+      
+       @return {Array} user selected IdPs identified by their entity ID
+    */
+    var retrieveUserSelectedIdPs = function(){
+        var userSelectedIdPs = [];
+        var i, j;
+        var cookies;
+
+        cookies = document.cookie.split( ';' );
+        for (i = 0; i < cookies.length; i++) {
+            //
+            // Do not use split('='), '=' is valid in Base64 encoding!
+            //
+            var cookie = cookies[i];
+            var splitPoint = cookie.indexOf( '=' );
+            var cookieName = cookie.substring(0, splitPoint);
+            var cookieValues = cookie.substring(splitPoint+1);
+                                
+            if ( '_saml_idp' == cookieName.replace(/^\s+|\s+$/g, '') ) {
+                cookieValues = cookieValues.replace(/^\s+|\s+$/g, '').split('+');
+                for(j=0; j< cookieValues.length; j++){
+                    if (0 === cookieValues[j].length) {
+                        continue;
+                    }
+                    var dec = base64Decode(decodeURIComponent(cookieValues[j]));
+                    if (dec.length > 0) {
+                        userSelectedIdPs.push(dec);
+                    }
+                }
+            }
+        }
+
+        return userSelectedIdPs;
+    };
+    
+    /**
+       Saves the IdPs selected by the user.
+      
+       @param {Array} idps idps selected by the user
+    */
+    var saveUserSelectedIdPs = function(idps){
+        var cookieData = [];
+        var length = idps.length;
+        if (length > 5) {
+            length = 5;
+        }
+        for(var i=0; i < length; i++){
+            if (idps[i].length > 0) {
+                cookieData.push(encodeURIComponent(base64Encode(idps[i])));
+            }
+        }
+        
+        var expireDate = null;
+        if(samlIdPCookieTTL){
+            var now = new Date();
+            cookieTTL = samlIdPCookieTTL * 24 * 60 * 60 * 1000;
+            expireDate = new Date(now.getTime() + cookieTTL);
+        }
+        
+        document.cookie='_saml_idp' + '=' + cookieData.join('+') + '; path = /' +
+            ((expireDate===null) ? '' : '; expires=' + expireDate.toUTCString());
+    };
+    
+    /**
+       Base64 encodes the given string.
+      
+       @param {String} input string to be encoded
+      
+       @return {String} base64 encoded string
+    */
+    var base64Encode = function(input) {
+        var output = '', c1, c2, c3, e1, e2, e3, e4;
+
+        for ( var i = 0; i < input.length; ) {
+            c1 = input.charCodeAt(i++);
+            c2 = input.charCodeAt(i++);
+            c3 = input.charCodeAt(i++);
+            e1 = c1 >> 2;
+            e2 = ((c1 & 3) << 4) + (c2 >> 4);
+            e3 = ((c2 & 15) << 2) + (c3 >> 6);
+            e4 = c3 & 63;
+            if (isNaN(c2)){
+                e3 = e4 = 64;
+            } else if (isNaN(c3)){
+                e4 = 64;
+            }
+            output += base64chars.charAt(e1) +
+                base64chars.charAt(e2) +
+                base64chars.charAt(e3) + 
+                base64chars.charAt(e4);
+        }
+
+        return output;
+    };
+    
+    /**
+       Base64 decodes the given string.
+      
+       @param {String} input string to be decoded
+      
+       @return {String} base64 decoded string
+    */
+    var base64Decode = function(input) {
+        var output = '', chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+        var i = 0;
+
+        // Remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+        var base64test = /[^A-Za-z0-9\+\/\=]/g;
+        input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
+
+        do {
+            enc1 = base64chars.indexOf(input.charAt(i++));
+            enc2 = base64chars.indexOf(input.charAt(i++));
+            enc3 = base64chars.indexOf(input.charAt(i++));
+            enc4 = base64chars.indexOf(input.charAt(i++));
+
+            chr1 = (enc1 << 2) | (enc2 >> 4);
+            chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+            chr3 = ((enc3 & 3) << 6) | enc4;
+
+            output = output + String.fromCharCode(chr1);
+
+            if (enc3 != 64) {
+                output = output + String.fromCharCode(chr2);
+            }
+            if (enc4 != 64) {
+                output = output + String.fromCharCode(chr3);
+            }
+
+            chr1 = chr2 = chr3 = '';
+            enc1 = enc2 = enc3 = enc4 = '';
+
+        } while (i < input.length);
+
+        return output;
+    };
+
+    // *************************************
+    // Private functions
+    //
+    // Error Handling.  we'll keep it separate with a view to eventual
+    //                  exbedding into log4js
+    //
+    // *************************************
+    /**
+       
+    */
+
+    var fatal = function(message) {
+        alert('FATAL - DISCO UI:' + message);
+        var txt = document.createTextNode(message); 
+        idpSelectDiv.appendChild(txt);
+    };
+
+    var debug = function() {
+        //
+        // Nothing
+    };
+}
+(new IdPSelectUI()).draw(new IdPSelectUIParms());
diff --git a/src/main/webapp/resources/js/shib/idpselect_config.js b/src/main/webapp/resources/js/shib/idpselect_config.js
index 848f0d01102..b2aae98b3ae 100644
--- a/src/main/webapp/resources/js/shib/idpselect_config.js
+++ b/src/main/webapp/resources/js/shib/idpselect_config.js
@@ -5,16 +5,18 @@ function IdPSelectUIParms() {
     // Adjust the following to fit into your local configuration
     //
     this.alwaysShow = true;          // If true, this will show results as soon as you start typing
-    this.dataSource = '/Shibboleth.sso/DiscoFeed';    // Where to get the data from
+//    this.dataSource = '/Shibboleth.sso/DiscoFeed';    // Where to get the data from
+    this.dataSource = '/resources/dev/sample-shib-identities.json'; // for use in development
     this.defaultLanguage = 'en';     // Language to use if the browser local doesnt have a bundle
     this.defaultLogo = 'flyingpiglogo.jpg';
     this.defaultLogoWidth = 90;
     this.defaultLogoHeight = 80;
-    //this.defaultReturn = null;       // If non null, then the default place to send users who are not approaching via the Discovery Protocol for example
-    // FIXME: don't hardcode URL here, use window.location.hostname or something
-    this.defaultReturn = "https://pdurbin.pagekite.me/Shibboleth.sso/Login?SAMLDS=1&target=http://pdurbin.pagekite.me/shib.xhtml";
+//    this.defaultReturn = null;       // If non null, then the default place to send users who are not
+    // Approaching via the Discovery Protocol for example
+    //this.defaultReturn = "https://example.org/Shibboleth.sso/DS?SAMLDS=1&target=https://example.org/secure";
+    this.defaultReturn = "https://" + window.location.hostname + "/Shibboleth.sso/Login?SAMLDS=1&target=http://" + window.location.hostname + "/shib.xhtml";
     this.defaultReturnIDParam = null;
-    this.helpURL = 'https://wiki.shibboleth.net/confluence/display/SHIB2/DSRoadmap';
+    this.helpURL = '/guides/index.html';
     this.ie6Hack = null;             // An array of structures to disable when drawing the pull down (needed to 
     // handle the ie6 z axis problem
     this.insertAtDiv = 'idpSelect';  // The div where we will insert the data
@@ -24,7 +26,9 @@ function IdPSelectUIParms() {
     this.preferredIdP = null;        // Array of entityIds to always show
     this.hiddenIdPs = null;          // Array of entityIds to delete
     this.ignoreKeywords = false;     // Do we ignore the <mdui:Keywords/> when looking for candidates
+    this.showListFirst = true;      // Do we start with a list of IdPs or just the dropdown
     this.samlIdPCookieTTL = 730;     // in days
+    this.setFocusTextBox = true;     // Set to false to supress focus 
     this.testGUI = false;
 
 
@@ -43,13 +47,13 @@ function IdPSelectUIParms() {
             'fatal.noReturnURL': "No URL return parameter provided",
             'fatal.badProtocol': "Return request must start with https:// or http://",
             'idpPreferred.label': 'Use a suggested selection:',
-            'idpEntry.label': 'Or enter your organization\'s name and click "Continue"',
-            'idpEntry.NoPreferred.label': 'Enter your organization\'s name and click "Continue"',
-            'idpList.label': 'Or select your organization from the list below',
-            'idpList.NoPreferred.label': 'Select your organization from the list below',
-            'idpList.defaultOptionLabel': 'Please select your organization...',
+            'idpEntry.label': 'Or enter your institutions\'s name',
+            'idpEntry.NoPreferred.label': 'Enter your institution\'s name',
+            'idpList.label': 'Or select your institution from the list below.',
+            'idpList.NoPreferred.label': 'Select your institution and click "Continue" to log in via your institution\'s authentication system.',
+            'idpList.defaultOptionLabel': 'Please select your institution...',
             'idpList.showList': 'Allow me to pick from a list',
-            'idpList.showSearch': 'Allow me to specify the site',
+            'idpList.showSearch': 'Allow me to type the name of my institution',
             'submitButton.label': 'Continue',
             'helpText': 'Help',
             'defaultLogoAlt': 'DefaultLogo'
@@ -74,6 +78,50 @@ function IdPSelectUIParms() {
             'submitButton.label': 'OK',
             'helpText': 'Hilfe',
             'defaultLogoAlt': 'Standard logo'
+        },
+        'ja': {
+            'fatal.divMissing': '"insertAtDiv" の ID を持つ <div> が HTML 中に存在しません',
+            'fatal.noXMLHttpRequest': 'ブラウザが XMLHttpRequest をサポートしていないので IdP 情報を取得できません',
+            'fatal.wrongProtocol': 'DSへ渡された Policy パラメータが "urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single" ではありません',
+            'fatal.wrongEntityId': 'SP から渡された entityId が設定値と異なります',
+            'fatal.noData': 'メタデータが空です',
+            'fatal.loadFailed': '次の URL からメタデータをダウンロードできませんでした: ',
+            'fatal.noparms': 'DSにパラメータが渡されておらず defaultReturn も設定されていません',
+            'fatal.noReturnURL': "戻り URL が指定されていません",
+            'fatal.badProtocol': "戻り URL は https:// か http:// で始まらなければなりません",
+            'idpPreferred.label': '選択候補の IdP:',
+            'idpEntry.label': 'もしくはあなたの所属機関名を入力してください',
+            'idpEntry.NoPreferred.label': 'あなたの所属機関名を入力してください',
+            'idpList.label': 'もしくはあなたの所属機関を選択してください',
+            'idpList.NoPreferred.label': 'あなたの所属機関を一覧から選択してください',
+            'idpList.defaultOptionLabel': '所属機関を選択してください...',
+            'idpList.showList': '一覧から選択する',
+            'idpList.showSearch': '機関名を入力する',
+            'submitButton.label': '選択',
+            'helpText': 'Help',
+            'defaultLogoAlt': 'DefaultLogo'
+        },
+        'pt-br': {
+            'fatal.divMissing': 'A tag <div> com "insertAtDiv" não foi encontrada no arquivo HTML',
+            'fatal.noXMLHttpRequest': 'Seu navegador não suporta "XMLHttpRequest", impossível de carregador os dados do IdP selecionado',
+            'fatal.wrongProtocol': 'A política "Policy" fornecida para o DS não foi "urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single"',
+            'fatal.wrongEntityId': 'entityId oferecido pelo SP não confere com o da configuração',
+            'fatal.noData': 'O arquivo de metadados não retornou nada;',
+            'fatal.loadFailed': 'Falhou ao realizar download do metadado de ',
+            'fatal.noparms': 'Sem parâmetros para sessão de descoberta e sem parâmetro "defaultReturn" configurado',
+            'fatal.noReturnURL': "Não foi definida um endereço (URL) de retorno no parâmetro",
+            'fatal.badProtocol': "Retorno do endereço requisitado deve começar com https:// ou http://",
+            'idpPreferred.label': 'Use estas Instituições sugeridas: ',
+            'idpEntry.label': 'Ou informe o nome da sua Instituição',
+            'idpEntry.NoPreferred.label': 'Informe o nome da sua Instituição',
+            'idpList.label': 'Ou selecione sua Instituição através da lista abaixo',
+            'idpList.NoPreferred.label': 'Selecione sua Instituição através da lista abaixo',
+            'idpList.defaultOptionLabel': 'Por favor, selecione sua Instituição: ',
+            'idpList.showList': 'Permitir que eu escolha um IdP através de uma lista',
+            'idpList.showSearch': 'Permitir que eu especifique o IdP',
+            'submitButton.label': 'Continuar ',
+            'helpText': 'Ajuda',
+            'defaultLogoAlt': 'Logo padrão'
         }
     };
 
@@ -83,6 +131,7 @@ function IdPSelectUIParms() {
     this.maxPreferredIdPs = 3;
     this.maxIdPCharsButton = 33;
     this.maxIdPCharsDropDown = 58;
+    this.maxIdPCharsAltTxt = 60;
 
     this.minWidth = 20;
     this.minHeight = 20;
diff --git a/src/main/webapp/shib-identity-picker.html b/src/main/webapp/shib-identity-picker.html
index 28113a2e68b..41688123cfd 100644
--- a/src/main/webapp/shib-identity-picker.html
+++ b/src/main/webapp/shib-identity-picker.html
@@ -9,15 +9,13 @@
     </head>
 
     <body>
-        <p>Log in via your institution</p>
-        <p>Select your institution and click "Continue" to log in via your institution's authentication system.</p>
+        <p style="font-weight: bolder; font-size: x-large">Log in via your institution</p>
 
         <div id="idpSelect"></div>
 
         <script src="/resources/js/shib/idpselect_config.js" type="text/javascript" language="javascript"></script>
 
-        <!--tested with shibboleth-embedded-ds-1.0.2-2.2.noarch, consider using the /resources/js/shib/idpselect.js version instead-->
-        <script src="/shibboleth-ds/idpselect.js" type="text/javascript" language="javascript"></script>
+        <script src="/resources/js/shib/idpselect.js" type="text/javascript" language="javascript"></script>
 
         <noscript>
             <!-- If you need to care about non javascript browsers you will need to