From c83987bd2000daf6432b9488ece9a8f17079c9c7 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 15 Mar 2022 10:43:11 -0400
Subject: [PATCH 1/2] fix: don't append to history on refresh or ajaxify to
 same url

---
 public/src/ajaxify.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 63f590bc12..e60a618bdb 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -43,6 +43,10 @@ ajaxify = window.ajaxify || {};
 			return true;
 		}
 
+		if (!quiet && url === ajaxify.currentPage + window.location.search + window.location.hash) {
+			quiet = true;
+		}
+
 		app.leaveCurrentRoom();
 
 		$(window).off('scroll');

From cd687cff06964021de7a4ab52cb7dba4a829cf24 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 15 Mar 2022 13:57:09 -0400
Subject: [PATCH 2/2] fix: #10393, move 'Create User' control to overflow menu

---
 public/language/en-GB/admin/manage/users.json | 3 ++-
 src/views/admin/manage/users.tpl              | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/public/language/en-GB/admin/manage/users.json b/public/language/en-GB/admin/manage/users.json
index d5c9914afc..2fe43e0e2a 100644
--- a/public/language/en-GB/admin/manage/users.json
+++ b/public/language/en-GB/admin/manage/users.json
@@ -18,7 +18,8 @@
 	"download-csv": "Download CSV",
 	"manage-groups": "Manage Groups",
 	"add-group": "Add Group",
-	"invite": "Invite",
+	"create": "Create User",
+	"invite": "Invite by Email",
 	"new": "New User",
 	"filter-by": "Filter by",
 	"pills.unvalidated": "Not Validated",
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index 7460554e28..37c79b780c 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -25,6 +25,7 @@
 				<div class="btn-group">
 					<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-ellipsis-v"></i></button>
 					<ul class="dropdown-menu dropdown-menu-right">
+						<li><a href="#" data-action="create">[[admin/manage/users:create]]</a></li>
 						{{{ if showInviteButton }}}<li><a href="#" component="user/invite">[[admin/manage/users:invite]]</a></li>{{{ end }}}
 						<li><a target="_blank" href="#" class="export-csv">[[admin/manage/users:download-csv]]</a></li>
 					</ul>
@@ -136,7 +137,3 @@
 
 	</div>
 </div>
-
-<button data-action="create" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-    <i class="material-icons">add</i>
-</button>
\ No newline at end of file