diff --git a/groups b/groups
index 48e05f8..33a5a89 100644
--- a/groups
+++ b/groups
@@ -10,4 +10,4 @@
 global:Project-Owners                   	Project Owners
 global:Registered-Users                 	Registered Users
 user:bocon                              	user/Brian O'Connor (bocon)
-user:hwchiu                             	user/Hung-Wei Chiu (hungwei)
+user:hwchiu                             	user/Hung-Wei Chiu (hwchiu)
diff --git a/project.config b/project.config
index 3d75006..d575faa 100644
--- a/project.config
+++ b/project.config
@@ -16,8 +16,8 @@
 	read = deny group GitHub Replication - XOS-Project
 	read = group Administrators
 	read = group Anonymous Users
-	read = group Service Users
 	read = group Registered Users
+	read = group Service Users
 	viewDrafts = group user/Cloud Lab (cloudlab)
 	deleteDrafts = block group Read-only Users
 	publishDrafts = block group Read-only Users
@@ -35,8 +35,8 @@
 	submit = group Administrators
 	submit = group Project Owners
 	label-Verified = -1..+1 group Administrators
-	label-Verified = -1..+1 group Service Users
 	label-Verified = -1..+1 group OverrideVerify
+	label-Verified = -1..+1 group Service Users
 [access "refs/meta/config"]
 	exclusiveGroupPermissions = read
 	read = group Administrators
@@ -52,11 +52,11 @@
 	create = group Project Owners
 [access "refs/tags/*"]
 	createTag = group Administrators
-	createTag = group Service Users
 	createTag = group Project Owners
+	createTag = group Service Users
 	createSignedTag = group Administrators
-	createSignedTag = group Service Users
 	createSignedTag = group Project Owners
+	createSignedTag = group Service Users
 	create = group Service Users
 [label "Code-Review"]
 	function = MaxWithBlock
@@ -89,7 +89,7 @@
 [capability]
 	accessDatabase = group Administrators
 	accessDatabase = group user/Brian O'Connor (bocon)
-	accessDatabase = group user/Hung-Wei Chiu (hungwei)
+	accessDatabase = group user/Hung-Wei Chiu (hwchiu)
 	administrateServer = group Administrators
 	modifyAccount = group Administrators
 	priority = batch group Service Users