diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp
index 8e6596f09..c5271cee1 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp
@@ -114,8 +114,8 @@
 									<h4>
 										<i class="icon-info-sign"></i> Warning:
 									</h4>
-									This client does not have any redirect URIs registered and could be using a 
-									malicious URI. You will be redirected to the following page if you click Approve:
+									This client does not have any redirect URIs registered and someone could be using a 
+									malicious URI here. You will be redirected to the following page if you click Approve:
 									<code><c:out value="${redirect_uri}" /></code>
 								</div>
 							</c:when>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
index 3b9d5abdd..90ee11c3c 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
@@ -151,7 +151,7 @@
 			</div>
 
 			<div class="control-group" id="tosUri">
-				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Terms of Service</label>
+				<label class="control-label">Terms of Service</label>
 				<div class="controls">
 					<input placeholder="http://" value="<%=tosUri%>" maxlength="1000" type="text" class=""/>
 					<p class="help-block">URL for the Terms of Service of this client, will be displayed to the user</p>
@@ -159,7 +159,7 @@
 			</div>
 
 			<div class="control-group" id="policyUri">
-				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Policy</label>
+				<label class="control-label">Policy Statement</label>
 				<div class="controls">
 					<input placeholder="http://" value="<%=policyUri%>" maxlength="1000" type="text" class=""/>
 					<p class="help-block">URL for the Policy Statement of this client, will be displayed to the user</p>
@@ -167,7 +167,7 @@
 			</div>
 
 			<div class="control-group" id="clientUri">
-				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Home Page</label>
+				<label class="control-label">Home Page</label>
 				<div class="controls">
 					<input placeholder="http://" value="<%=clientUri%>" maxlength="1000" type="text" class=""/>
 					<p class="help-block">URL for the client's home page, will be displayed to the user</p>