diff --git a/src/routes/admin.js b/src/routes/admin.js
index a8d95776ee..689867d70e 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -58,7 +58,7 @@ function addRoutes(router, middleware, controllers) {
 	router.get('/manage/users/sort-posts', controllers.admin.users.sortByPosts);
 	router.get('/manage/users/sort-reputation', controllers.admin.users.sortByReputation);
 	router.get('/manage/users/banned', controllers.admin.users.banned);
-	router.get('/manage/users/registration', controllers.admin.users.registrationQueue);
+	router.get('/manage/registration', controllers.admin.users.registrationQueue);
 
 	router.get('/manage/groups', controllers.admin.groups.list);
 	router.get('/manage/groups/:name', controllers.admin.groups.get);
diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl
index b602f54141..a89bc502a2 100644
--- a/src/views/admin/manage/registration.tpl
+++ b/src/views/admin/manage/registration.tpl
@@ -1,55 +1,53 @@
 <div class="registration">
-	<div class="col-lg-9">
-		<div class="panel panel-default">
-			<div class="panel-heading"><i class="fa fa-group"></i> Registration Queue</div>
-			<div class="panel-body">
-				<table class="table table-striped users-list">
-					<tr>
-						<th>Name</th>
-						<th>Email</th>
-						<th>IP</th>
-						<th>Time</th>
-						<th></th>
-					</tr>
-					<!-- BEGIN users -->
-					<tr data-username="{users.username}">
-						<td>
-							<!-- IF users.usernameSpam -->
-							<i class="fa fa-times-circle text-danger" title="Frequency: {users.spamData.username.frequency} Appears: {users.spamData.username.appears} Confidence: {users.spamData.username.confidence}"></i>
-							<!-- ELSE -->
-							<i class="fa fa-check text-success"></i>
-							<!-- ENDIF users.usernameSpam -->
-							{users.username}
-						</td>
-						<td>
-							<!-- IF users.emailSpam -->
-							<i class="fa fa-times-circle text-danger" title="Frequency: {users.spamData.email.frequency} Appears: {users.spamData.email.appears}"></i>
-							<!-- ELSE -->
-							<i class="fa fa-check text-success"></i>
-							<!-- ENDIF users.emailSpam -->
-							{users.email}
-						</td>
-						<td>
-							<!-- IF users.ipSpam -->
-							<i class="fa fa-times-circle text-danger" title="Frequency: {users.spamData.ip.frequency} Appears: {users.spamData.ip.appears}"></i>
-							<!-- ELSE -->
-							<i class="fa fa-check text-success"></i>
-							<!-- ENDIF users.ipSpam -->
-							{users.ip}
-						</td>
-						<td>
-							<span class="timeago" title="{users.timestamp}"></span>
-						</td>
-						<td>
-							<div class="btn-group pull-right">
-								<button class="btn btn-success btn-xs" data-action="accept"><i class="fa fa-check"></i></button>
-								<button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
-							</div>
-						</td>
-					</tr>
-					<!-- END users -->
-				</table>
-			</div>
-		</div>
-	</div>
+	<table class="table table-striped users-list">
+		<tr>
+			<th>Name</th>
+			<th>Email</th>
+			<th>IP</th>
+			<th>Time</th>
+			<th></th>
+		</tr>
+		<!-- IF !users.length -->
+		<p>
+			There are no users in the registration queue. To enable this feature go to <a href="{relative_path}/admin/settings/user#authentication">Settings -> User -> Authentication</a> and set <strong>Registration Type</strong> to "Admin Approval".
+		</p>
+		<!-- ENDIF !users.length -->
+		<!-- BEGIN users -->
+		<tr data-username="{users.username}">
+			<td>
+				<!-- IF users.usernameSpam -->
+				<i class="fa fa-times-circle text-danger" title="Frequency: {users.spamData.username.frequency} Appears: {users.spamData.username.appears} Confidence: {users.spamData.username.confidence}"></i>
+				<!-- ELSE -->
+				<i class="fa fa-check text-success"></i>
+				<!-- ENDIF users.usernameSpam -->
+				{users.username}
+			</td>
+			<td>
+				<!-- IF users.emailSpam -->
+				<i class="fa fa-times-circle text-danger" title="Frequency: {users.spamData.email.frequency} Appears: {users.spamData.email.appears}"></i>
+				<!-- ELSE -->
+				<i class="fa fa-check text-success"></i>
+				<!-- ENDIF users.emailSpam -->
+				{users.email}
+			</td>
+			<td>
+				<!-- IF users.ipSpam -->
+				<i class="fa fa-times-circle text-danger" title="Frequency: {users.spamData.ip.frequency} Appears: {users.spamData.ip.appears}"></i>
+				<!-- ELSE -->
+				<i class="fa fa-check text-success"></i>
+				<!-- ENDIF users.ipSpam -->
+				{users.ip}
+			</td>
+			<td>
+				<span class="timeago" title="{users.timestamp}"></span>
+			</td>
+			<td>
+				<div class="btn-group pull-right">
+					<button class="btn btn-success btn-xs" data-action="accept"><i class="fa fa-check"></i></button>
+					<button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
+				</div>
+			</td>
+		</tr>
+		<!-- END users -->
+	</table>
 </div>
\ No newline at end of file
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index 1bf93986d4..96df92ca3f 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -8,7 +8,6 @@
 					<li><a href='{config.relative_path}/admin/manage/users/sort-posts'>Top Posters</a></li>
 					<li><a href='{config.relative_path}/admin/manage/users/sort-reputation'>Most Reputation</a></li>
 					<li><a href='{config.relative_path}/admin/manage/users/banned'>Banned</a></li>
-					<li><a href='{config.relative_path}/admin/manage/users/registration'>Registration Queue</a></li>
 					<li><a href='{config.relative_path}/admin/manage/users/search'>User Search</a></li>
 
 
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index 537b5e3f37..62f0845514 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -19,6 +19,7 @@
 				<li><a href="{relative_path}/admin/manage/categories">Categories</a></li>
 				<li><a href="{relative_path}/admin/manage/tags">Tags</a></li>
 				<li><a href="{relative_path}/admin/manage/users">Users</a></li>
+				<li><a href="{relative_path}/admin/manage/registration">Registration Queue</a></li>
 				<li><a href="{relative_path}/admin/manage/groups">Groups</a></li>
 				<li><a href="{relative_path}/admin/manage/flags">Flags</a></li>
 			</ul>