diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
index 3e4e0eb9f..cc3af951e 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -44,24 +44,25 @@
         </p>
     </section>
 </#if>
-
-<section id="filter-roles">
-    <select name="roleFilterUri" id="">
-        <option value="" <#if roleFilterUri = "">selected</#if> >Filter by roles</option>
-        <#list roles as role>
-        <option value="${role.uri}" <#if roleFilterUri = role.uri>selected</#if> >${role.label}</option>
-        </#list>
-        <!--
-        When roleFilterUri or searchTerm changes,
-        pageIndex should be set to 1. When any of these changes (including pageIndex), the form 
-        should be submitted.
-        -->
-    </select>
-</section>
+<form method="POST" action="${formUrls.list}" class="customForm" role="filter by roles">
+    <section id="filter-roles">
+        <select name="roleFilterUri" id="roleFilterUri">
+            <option value="" <#if roleFilterUri = "">selected</#if> >Filter by roles</option>
+            <#list roles as role>
+            <option value="${role.uri}" <#if roleFilterUri = role.uri>selected</#if> >${role.label}</option>
+            </#list>
+            <!--
+            When roleFilterUri or searchTerm changes,
+            pageIndex should be set to 1. When any of these changes (including pageIndex), the form 
+            should be submitted.
+            -->
+        </select>
+    </section>
+</form>
 
 <form method="POST" action="${formUrls.list}" class="customForm" role="search accounts">
     <section id="search-accounts">
-        <input type="text" name="" />
+        <input type="text" name="searchTerm" />
         <input class="submit" type="submit" value="Search accounts"/>
         <!--
             When searchTerm changes, 
diff --git a/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl b/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
index f84c1d8e6..d9efc2f62 100644
--- a/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
+++ b/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
@@ -5,6 +5,7 @@
     and delete function.
 ------------------------------------------------------------------------------>
 
+
 <#assign counts=[25, 50, 100] /> <#-- accounts per page-->
 
 <#macro accountsNav accountsCount=counts>
@@ -17,12 +18,13 @@
       -->
 
       <nav class="display-tools">
-          <span>| n accounts | </span>  
+          <span>| ${total} accounts | </span>  
 
           <select name="accountsPerPage" class="accounts-per-page">
               <#list accountsCount as count>
-              <option value="${count}" <#if accountsPerPage= count>selected</#if> >${count}</option>
+              <option value="${count}" <#if accountsPerPage=count>selected</#if> >${count}</option>
               </#list>
+             <option value="${total}" <#if accountsPerPage=total>selected</#if> >All</option>
               <!--     
                   When accountsPerPage changes, 
                   set pageIndex to 1