diff --git a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/result.html b/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/result.html
index 1518c72edf3..be38e89a36b 100644
--- a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/result.html
+++ b/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/result.html
@@ -150,7 +150,7 @@
 																$('#page-prev-btn').click(function() {
 																	var btn = $(this);
 																	handleActionButtonClick($(this));
-																	btn.append($('<input />', { type: 'hidden', name: 'page-url', value: '<th:block th:text="${bundle.linkPrevious}"/>' }));
+																	btn.append($('<input />', { type: 'hidden', name: 'page-url', value: [[${bundle.linkPrevious.value}]] }));
 																	$("#outerForm").attr("action", "page").submit();
 	
 																});
@@ -167,7 +167,7 @@
 																$('#page-next-btn').click(function() {
 																	var btn = $(this);
 																	handleActionButtonClick($(this));
-																	btn.append($('<input />', { type: 'hidden', name: 'page-url', value: '<th:block th:text="${bundle.linkNext}"/>' }));
+																	btn.append($('<input />', { type: 'hidden', name: 'page-url', value: [[${bundle.linkNext.value}]] }));
 																	$("#outerForm").attr("action", "page").submit();
 																});
 															</script>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 365fcce6b06..f59ff0980ca 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -84,6 +84,12 @@
 				does not contain an ID, or the ID does not match
 				the request URL. Thanks to Jim Steel for reporting!
 			</action>
+			<action type="fix" issue="500">
+				Web Testing UI's next and previous buttons for paging
+				through paged results did not work after the migration
+				to using Thymeleaf 3. Thanks to GitHub user @gsureshkumar
+				for reporting!
+			</action>
 		</release>
 		<release version="2.1" date="2016-11-11">
 			<action type="add">