diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
index 1aed99a36..40a1338e3 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
@@ -80,8 +80,8 @@
             "id-token-signing-algorithm": "ID Token Signing Algorithm",
             "id-token-timeout": "ID Token Timeout",
             "implicit": "implicit",
-            "intiate-login": "Intiate Login",
-            "intiate-login-help": "URL to initiate login on the client",
+            "initiate-login": "Initiate Login",
+            "initiate-login-help": "URL to initiate login on the client",
             "introspection": "Introspection",
             "jwk-set": "JWK Set",
             "jwk-set-help": "URL for the client's JSON Web Key set",
@@ -358,7 +358,9 @@
     		"issuers": "Issuers",
     		"claim": "Claim",
     		"value": "Value"
-    	}	
+    	},
+    	"webfinger-error": "Error",
+    	"webfinger-error-description": "The server was unable to find an identity provider for <code>__email__</code>."
     },
 	"copyright": "Powered by <a href=\"https://github.com/mitreid-connect/\">MITREid Connect <span class=\"label\">{0}</span></a> <span class=\"pull-right\">&copy; 2015 The MITRE Corporation and MIT KIT.</span>.",
 	"about": {
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/policy.js b/openid-connect-server-webapp/src/main/webapp/resources/js/policy.js
index 985b0bd06..49ecd61e1 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/policy.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/policy.js
@@ -315,7 +315,17 @@ var ClaimListView = Backbone.View.extend({
     		_self.render();
     		
     	}).error(function(jqXHR, textStatus, errorThrown) {
-    		console.log(errorThrown);
+    		console.log("An error occurred when doing a webfinger lookup", errorThrown);
+    	    
+    		//Display an alert with an error message
+			$('#modalAlert div.modal-header').html($.t('policy.webfinger-error'));
+    		$('#modalAlert div.modal-body').html($.t('policy.webfinger-error-description', {email: email}));
+    		
+			 $("#modalAlert").modal({ // wire up the actual modal functionality and show the dialog
+				 "backdrop" : "static",
+				 "keyboard" : true,
+				 "show" : true // ensure the modal is shown immediately
+			 });
     	});
     	
     },