diff --git a/src/routes/admin.js b/src/routes/admin.js
index ab2d3c14b1..3a64902b93 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -46,7 +46,7 @@ function addRoutes(router, middleware, controllers) {
 
 	router.get('/manage/tags', controllers.admin.tags.get);
 
-	router.get('/manage/users', controllers.admin.users.search);
+	router.get('/manage/users', controllers.admin.users.sortByJoinDate);
 	router.get('/manage/users/search', controllers.admin.users.search);
 	router.get('/manage/users/latest', controllers.admin.users.sortByJoinDate);
 	router.get('/manage/users/sort-posts', controllers.admin.users.sortByPosts);
diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl
index def766a09f..d393adf6b8 100644
--- a/src/views/admin/header.tpl
+++ b/src/views/admin/header.tpl
@@ -104,7 +104,7 @@
 						<li class="nav-header"><i class="fa fa-fw fa-comments-o"></i> Manage</li>
 						<li><a href="{relative_path}/admin/manage/categories/active">Categories</a></li>
 						<li><a href="{relative_path}/admin/manage/tags">Tags</a></li>
-						<li><a href="{relative_path}/admin/manage/users/latest">Users</a></li>
+						<li><a href="{relative_path}/admin/manage/users">Users</a></li>
 						<li><a href="{relative_path}/admin/manage/groups">Groups</a></li>
 					</ul>
 				</div>
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index 380679cfd4..b5b372beeb 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -4,11 +4,11 @@
 			<div class="panel-heading"><i class="fa fa-user"></i> Users</div>
 			<div class="panel-body">
 				<ul class="nav nav-pills">
-					<li class='active'><a href='{relative_path}/admin/manage/users/search'>Search</a></li>
-					<li class=''><a href='{relative_path}/admin/manage/users/latest'>Latest Users</a></li>
+					<li class='active'><a href='{relative_path}/admin/manage/users/latest'>Latest Users</a></li>
 					<li class=''><a href='{relative_path}/admin/manage/users/sort-posts'>Top Posters</a></li>
 					<li class=''><a href='{relative_path}/admin/manage/users/sort-reputation'>Most Reputation</a></li>
 					<li class=''><a href='{relative_path}/admin/manage/users/banned'>Banned</a></li>
+					<li class=''><a href='{relative_path}/admin/manage/users/search'>User Search</a></li>
 
 
 					<div class="btn-group pull-right">