diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 8c8113df..11908026 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -931,13 +931,12 @@ bool CWebAdminSock::UserPage(CString& sPageRet, CUser* pUser) {
 
 	if (!pUser) {
 		// Add User Submission
-		if (!pNewUser->IsValid(sErr)) {
+		if (!CZNC::Get().AddUser(pNewUser, sErr)) {
 			delete pNewUser;
 			GetErrorPage(sPageRet, "Invalid submission [" + sErr + "]");
 			return true;
 		}
 
-		CZNC::Get().AddUser(pNewUser);
 		if (!CZNC::Get().WriteConfig()) {
 			GetErrorPage(sPageRet, "User added, but config was not written");
 			return true;