diff --git a/src/main/webapp/META-INF/custom_jsps/html/portlet/login/RequestingApplication.jsp b/src/main/webapp/META-INF/custom_jsps/html/portlet/login/RequestingApplication.jsp
index 149acd4..c48b12e 100644
--- a/src/main/webapp/META-INF/custom_jsps/html/portlet/login/RequestingApplication.jsp
+++ b/src/main/webapp/META-INF/custom_jsps/html/portlet/login/RequestingApplication.jsp
@@ -16,14 +16,24 @@
 </script>
 <div style="text-align: center;">
 	<%
-		hideCreateAccountAndForgotPassword = true;
+		
 			Map<String, String> queryMap = AuthUtil.getQueryMap(redirect);
 			if (!queryMap.isEmpty()) {
 				String clientId = queryMap.get(GET_CLIENT_ID_PARAMETER);
+				if (clientId == null || clientId.compareTo("")==0) {
+					clientNotAuthorised = true;%>
+					<p class="lead">We're sorry your application is not authorised by
+							D4Science</p>
+						<p style="color: red;">
+							The client_id does not exist or something occurred in retrieving it
+							from the Information System: (<%=clientId%>)
+						</p>
+				<%}
 				String scope = queryMap.get(GET_SCOPE_PARAMETER);
 				if (clientId != null && clientId.compareTo("") != 0) {
 					RequestingApp app = AuthUtil.getAuthorisedApplicationInfoFromIs(clientId);
 					if (app != null) {
+						hideCreateAccountAndForgotPassword = true;
 						if (app.getLogoURL() != null && !app.getLogoURL().isEmpty()) {
 	%>
 	<p>
@@ -58,7 +68,7 @@
 	D4Science</p>
 <p style="color: red;">
 	The client_id does not exist or something occurred in retrieving it
-	from the Information System: " (<%=clientId%>)
+	from the Information System: (<%=clientId%>)
 </p>
 <%
 	clientNotAuthorised = true;