diff --git a/ChangeLog.rst b/ChangeLog.rst
index 778a91b..09ab453 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,10 @@
 Dev
 ***
 
+* [fix ] fix many encoding errors in AD backend
+* [impr] add unit tests on AD backend
+* [impr] display the admin result page if searching as admin in navbar form
+
 Version 0.3.5
 *************
 
diff --git a/resources/templates/navbar.tmpl b/resources/templates/navbar.tmpl
index 75dfe73..99d3a88 100644
--- a/resources/templates/navbar.tmpl
+++ b/resources/templates/navbar.tmpl
@@ -13,12 +13,19 @@
                 <a class="navbar-brand" href="/searchadmin">Delete/Modify User</a>
                 % endif
                 </div>
-
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                     <a class="navbar-brand navbar-right" href='/logout'><span class="glyphicon glyphicon-off"></span> Logout</a>
+                            % if is_admin:
+		            <form method='GET' action='/searchadmin' class="navbar-form navbar-right" role="search" data-toggle="validator">
+                            % else:
 		            <form method='GET' action='/searchuser' class="navbar-form navbar-right" role="search" data-toggle="validator">
+                            % endif
                         <div class="form-group">
+                            % if is_admin:
+                            <input type="text" class="form-control" name="searchstring" placeholder="Search User">
+                            % else:
                             <input type="text" class="form-control" data-minlength="3" name="searchstring" placeholder="Search User" data-error="Too short" required>
+                            % endif
                         </div>
                         <button type="submit" class="btn btn-default">Submit</button>
                     </form>